greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Finally move to MongoDB

Browse source
This commit is contained in:
Greg 2021-03-26 15:17:17 +01:00
parent 8142e592e1
commit d6109a767e
31 changed files with 343 additions and 376 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pom.xml
View file

@ -76,11 +76,6 @@
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20210307</version> <version>20210307</version>
</dependency> </dependency>
<dependency>
<groupId>com.rethinkdb</groupId>
<artifactId>rethinkdb-driver</artifactId>
<version>2.4.4</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
@ -106,6 +101,11 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>2.12.2</version> <version>2.12.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.2.2</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

22
src/main/java/one/bbn/hadder/Hadder.java
View file

@ -31,7 +31,7 @@ import one.bbn.hadder.commands.settings.LanguageCommand;
import one.bbn.hadder.commands.settings.UserPrefixCommand; import one.bbn.hadder.commands.settings.UserPrefixCommand;
import one.bbn.hadder.core.CommandHandler; import one.bbn.hadder.core.CommandHandler;
import one.bbn.hadder.core.Config; import one.bbn.hadder.core.Config;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.listener.*; import one.bbn.hadder.listener.*;
import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.OnlineStatus;
import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.entities.Activity;
@ -55,8 +55,8 @@ public class Hadder {
if (!config.fileExists()) config.create(); if (!config.fileExists()) config.create();
config.load(); config.load();
Rethink rethink = new Rethink(config); Mongo mongo = new Mongo(config);
rethink.connect(); mongo.connect();
DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.getIntents(32509)); DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.getIntents(32509));
@ -137,14 +137,14 @@ public class Hadder {
new CoronaCommand()), config, helpCommand); new CoronaCommand()), config, helpCommand);
builder.addEventListeners( builder.addEventListeners(
new MentionListener(rethink, config), new MentionListener(mongo, config),
new PrivateMessageListener(rethink), new PrivateMessageListener(mongo),
new CommandListener(rethink, commandHandler, audioManager), new CommandListener(mongo, commandHandler, audioManager),
new GuildListener(rethink, config), new GuildListener(mongo, config),
new ReadyListener(rethink, config), new ReadyListener(config),
new InviteLinkListener(rethink), new InviteLinkListener(mongo),
new RulesListener(rethink), new RulesListener(mongo),
new StarboardListener(rethink), new StarboardListener(mongo),
new VoiceLeaveListener(audioManager), new VoiceLeaveListener(audioManager),
new OwnerMessageListener(config)); new OwnerMessageListener(config));

36
src/main/java/one/bbn/hadder/commands/CommandEvent.java
View file

@ -20,9 +20,9 @@ import one.bbn.hadder.audio.AudioManager;
import one.bbn.hadder.commands.general.HelpCommand; import one.bbn.hadder.commands.general.HelpCommand;
import one.bbn.hadder.core.CommandHandler; import one.bbn.hadder.core.CommandHandler;
import one.bbn.hadder.core.Config; import one.bbn.hadder.core.Config;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkServer; import one.bbn.hadder.db.MongoServer;
import one.bbn.hadder.db.RethinkUser; import one.bbn.hadder.db.MongoUser;
import one.bbn.hadder.utils.EventWaiter; import one.bbn.hadder.utils.EventWaiter;
import one.bbn.hadder.utils.MessageEditor; import one.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
@ -33,34 +33,34 @@ import javax.annotation.Nonnull;
public class CommandEvent extends MessageReceivedEvent { public class CommandEvent extends MessageReceivedEvent {
private Rethink rethink; private Mongo mongo;
private Config config; private Config config;
private CommandHandler commandHandler; private CommandHandler commandHandler;
private HelpCommand helpCommand; private HelpCommand helpCommand;
private MessageEditor messageEditor; private MessageEditor messageEditor;
private EventWaiter eventWaiter; private EventWaiter eventWaiter;
private AudioManager audioManager; private AudioManager audioManager;
private RethinkUser rethinkUser; private MongoUser mongoUser;
private RethinkServer rethinkServer; private MongoServer mongoServer;
public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Mongo mongo, Config config,
CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor,
EventWaiter eventWaiter, AudioManager audioManager, RethinkUser rethinkUser, EventWaiter eventWaiter, AudioManager audioManager, MongoUser mongoUser,
RethinkServer rethinkServer) { MongoServer mongoServer) {
super(api, responseNumber, message); super(api, responseNumber, message);
this.rethink = rethink; this.mongo = mongo;
this.config = config; this.config = config;
this.commandHandler = commandHandler; this.commandHandler = commandHandler;
this.helpCommand = helpCommand; this.helpCommand = helpCommand;
this.messageEditor = messageEditor; this.messageEditor = messageEditor;
this.eventWaiter = eventWaiter; this.eventWaiter = eventWaiter;
this.audioManager = audioManager; this.audioManager = audioManager;
this.rethinkUser = rethinkUser; this.mongoUser = mongoUser;
this.rethinkServer = rethinkServer; this.mongoServer = mongoServer;
} }
public Rethink getRethink() { public Mongo getMongo() {
return rethink; return mongo;
} }
public Config getConfig() { public Config getConfig() {
@ -87,11 +87,11 @@ public class CommandEvent extends MessageReceivedEvent {
return audioManager; return audioManager;
} }
public RethinkServer getRethinkServer() { public MongoServer getMongoServer() {
return rethinkServer; return mongoServer;
} }
public RethinkUser getRethinkUser() { public MongoUser getMongoUser() {
return rethinkUser; return mongoUser;
} }
} }

2
src/main/java/one/bbn/hadder/commands/fun/ClydeCommand.java
View file

@ -40,7 +40,7 @@ public class ClydeCommand implements Command {
if (args.length > 0) { if (args.length > 0) {
if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) { if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
TextChannel channel = e.getMessage().getTextChannel(); TextChannel channel = e.getMessage().getTextChannel();
String content = e.getMessage().getContentRaw().replace(e.getRethinkServer().getPrefix(), "").replace(e.getRethinkUser().getPrefix(), "").replace("clyde", ""); String content = e.getMessage().getContentRaw().replace(e.getMongoServer().getPrefix(), "").replace(e.getMongoUser().getPrefix(), "").replace("clyde", "");
Webhook webhook = channel.createWebhook(e.getConfig().getClydeName()).complete(); Webhook webhook = channel.createWebhook(e.getConfig().getClydeName()).complete();
try { try {

4
src/main/java/one/bbn/hadder/commands/general/HelpCommand.java
View file

@ -79,10 +79,10 @@ public class HelpCommand implements Command {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
b.append(e.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(e.getMessageEditor().getTerm(cmd.description())).append("\n"); b.append(e.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(e.getMessageEditor().getTerm(cmd.description())).append("\n");
if (cmd.usage() != null) { if (cmd.usage() != null) {
b.append(e.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(e.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.usage()).append("\n"); b.append(e.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(e.getMongoServer().getPrefix()).append(name).append(" ").append(cmd.usage()).append("\n");
} }
if (cmd.example() != null) { if (cmd.example() != null) {
b.append(e.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(e.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.example()); b.append(e.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(e.getMongoServer().getPrefix()).append(name).append(" ").append(cmd.example());
} }
e.getChannel().sendMessage(e.getMessageEditor().getMessage( e.getChannel().sendMessage(e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO) MessageEditor.MessageType.INFO)

8
src/main/java/one/bbn/hadder/commands/moderation/EditRulesCommand.java
View file

@ -28,7 +28,7 @@ public class EditRulesCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent e) { public void executed(String[] args, CommandEvent e) {
if (e.getRethinkServer().getMessageID().length() == 18) { if (e.getMongoServer().getMessageID().length() == 18) {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.moderation.editrules.message.title", "commands.moderation.editrules.message.title",
"commands.moderation.editrules.message.description").build()).queue(); "commands.moderation.editrules.message.description").build()).queue();
@ -68,13 +68,13 @@ public class EditRulesCommand implements Command {
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.moderation.editrules.error.title", "", "commands.moderation.editrules.error.title", "",
"commands.moderation.editrules.error.description", e.getRethinkServer().getPrefix()).build()).queue(); "commands.moderation.editrules.error.description", e.getMongoServer().getPrefix()).build()).queue();
} }
} }
public void checkChannel(CommandEvent e, String rules, TextChannel channel) { public void checkChannel(CommandEvent e, String rules, TextChannel channel) {
try { try {
channel.retrieveMessageById(e.getRethinkServer().getMessageID()).queue(); channel.retrieveMessageById(e.getMongoServer().getMessageID()).queue();
setRules(e, rules, channel); setRules(e, rules, channel);
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.moderation.editrules.success.title", "commands.moderation.editrules.success.title",
@ -87,7 +87,7 @@ public class EditRulesCommand implements Command {
} }
public void setRules(CommandEvent e, String rules, TextChannel channel) { public void setRules(CommandEvent e, String rules, TextChannel channel) {
channel.retrieveMessageById(e.getRethinkServer().getMessageID()).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) channel.retrieveMessageById(e.getMongoServer().getMessageID()).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setTitle("Rules") .setTitle("Rules")
.setDescription(rules) .setDescription(rules)
.build()).queue(); .build()).queue();

12
src/main/java/one/bbn/hadder/commands/moderation/InviteDetectCommand.java
View file

@ -31,15 +31,15 @@ public class InviteDetectCommand implements Command {
String opinion = args[0].toLowerCase(); String opinion = args[0].toLowerCase();
switch (opinion) { switch (opinion) {
case "on": case "on":
if (!e.getRethinkServer().hasInviteDetect()) { if (!e.getMongoServer().hasInviteDetect()) {
e.getRethinkServer().setInviteDetect(true); e.getMongoServer().setInviteDetect(true);
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
"commands.moderation.invitedetect.activate.success.title", "commands.moderation.invitedetect.activate.success.title",
"commands.moderation.invitedetect.activate.success.description") "commands.moderation.invitedetect.activate.success.description")
.build()).queue(); .build()).queue();
e.getRethinkServer().push(); e.getMongoServer().push();
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
MessageEditor.MessageType.ERROR, MessageEditor.MessageType.ERROR,
@ -50,14 +50,14 @@ public class InviteDetectCommand implements Command {
break; break;
case "off": case "off":
if (e.getRethinkServer().hasInviteDetect()) { if (e.getMongoServer().hasInviteDetect()) {
e.getRethinkServer().setInviteDetect(false); e.getMongoServer().setInviteDetect(false);
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
"commands.moderation.invitedetect.deactivate.success.title", "commands.moderation.invitedetect.deactivate.success.title",
"commands.moderation.invitedetect.deactivate.success.description") "commands.moderation.invitedetect.deactivate.success.description")
.build()).queue(); .build()).queue();
e.getRethinkServer().push(); e.getMongoServer().push();
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
MessageEditor.MessageType.ERROR, MessageEditor.MessageType.ERROR,

16
src/main/java/one/bbn/hadder/commands/moderation/NickCommand.java
View file

@ -34,8 +34,8 @@ public class NickCommand implements Command {
if (!e.getMessage().getMentionedMembers().get(0).getId().equals(e.getGuild().getSelfMember().getId())) { if (!e.getMessage().getMentionedMembers().get(0).getId().equals(e.getGuild().getSelfMember().getId())) {
if (e.getGuild().getSelfMember().canInteract(e.getMessage().getMentionedMembers().get(0))) { if (e.getGuild().getSelfMember().canInteract(e.getMessage().getMentionedMembers().get(0))) {
if (args.length > 1) { if (args.length > 1) {
if (e.getMessage().getContentRaw().startsWith(e.getRethinkUser().getPrefix())) { if (e.getMessage().getContentRaw().startsWith(e.getMongoUser().getPrefix())) {
e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getMongoUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue();
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
@ -44,8 +44,8 @@ public class NickCommand implements Command {
"commands.moderation.nick.success.description", "commands.moderation.nick.success.description",
e.getMessage().getMentionedMembers().get(0).getUser().getAsTag() e.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
).build()).queue(); ).build()).queue();
} else if (e.getMessage().getContentRaw().startsWith(e.getRethinkServer().getPrefix())) { } else if (e.getMessage().getContentRaw().startsWith(e.getMongoServer().getPrefix())) {
e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getMongoServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue();
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
@ -59,8 +59,8 @@ public class NickCommand implements Command {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} }
} else { } else {
if (e.getMessage().getContentRaw().startsWith(e.getRethinkUser().getPrefix())) { if (e.getMessage().getContentRaw().startsWith(e.getMongoUser().getPrefix())) {
e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getMongoUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue();
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
@ -68,8 +68,8 @@ public class NickCommand implements Command {
"✅", "✅",
"commands.moderation.nick.myself.success.description", "commands.moderation.nick.myself.success.description",
"").build()).queue(); "").build()).queue();
} else if (e.getMessage().getContentRaw().startsWith(e.getRethinkServer().getPrefix())) { } else if (e.getMessage().getContentRaw().startsWith(e.getMongoServer().getPrefix())) {
e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getMongoServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue();
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,

4
src/main/java/one/bbn/hadder/commands/moderation/PrefixCommand.java
View file

@ -29,8 +29,8 @@ public class PrefixCommand implements Command {
public void executed(String[] args, CommandEvent e) { public void executed(String[] args, CommandEvent e) {
if (args.length == 1) { if (args.length == 1) {
if (!args[0].contains("\"")) { if (!args[0].contains("\"")) {
e.getRethinkServer().setPrefix(args[0]); e.getMongoServer().setPrefix(args[0]);
e.getRethinkServer().push(); e.getMongoServer().push();
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
"commands.moderation.prefix.success.title", "commands.moderation.prefix.success.title",

8
src/main/java/one/bbn/hadder/commands/moderation/RulesCommand.java
View file

@ -174,8 +174,8 @@ public class RulesCommand implements Command {
.build()).queue(); .build()).queue();
ex.printStackTrace(); ex.printStackTrace();
} }
e.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote.toString(), demote.toString()); e.getMongoServer().updateRules(rules.getId(), role.getId(), aemote.toString(), demote.toString());
e.getRethinkServer().push(); e.getMongoServer().push();
} else { } else {
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
@ -220,8 +220,8 @@ public class RulesCommand implements Command {
.build()).queue(); .build()).queue();
ex.printStackTrace(); ex.printStackTrace();
} }
e.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote, demote); e.getMongoServer().updateRules(rules.getId(), role.getId(), aemote, demote);
e.getRethinkServer().push(); e.getMongoServer().push();
} else { } else {
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(

8
src/main/java/one/bbn/hadder/commands/moderation/StarboardCommand.java
View file

@ -26,7 +26,7 @@ public class StarboardCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent e) { public void executed(String[] args, CommandEvent e) {
if (e.getMessage().getMentionedChannels().size() == 1) { if (e.getMessage().getMentionedChannels().size() == 1) {
e.getRethinkServer().setStarboard(e.getMessage().getMentionedChannels().get(0).getId()); e.getMongoServer().setStarboard(e.getMessage().getMentionedChannels().get(0).getId());
e.getChannel().sendMessage( e.getChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
@ -37,16 +37,16 @@ public class StarboardCommand implements Command {
if (args.length > 0) { if (args.length > 0) {
TextChannel channel = e.getGuild().getTextChannelById(args[0]); TextChannel channel = e.getGuild().getTextChannelById(args[0]);
if (channel != null) { if (channel != null) {
e.getRethinkServer().setStarboard(channel.getId()); e.getMongoServer().setStarboard(channel.getId());
} }
} else e.getHelpCommand().sendHelp(this, e); } else e.getHelpCommand().sendHelp(this, e);
} }
if (args.length == 2) { if (args.length == 2) {
e.getRethinkServer().setNeededStars(args[1]); e.getMongoServer().setNeededStars(args[1]);
} }
e.getRethinkServer().push(); e.getMongoServer().push();
} }
@Override @Override

2
src/main/java/one/bbn/hadder/commands/music/PauseCommand.java
View file

@ -35,7 +35,7 @@ public class PauseCommand implements Command {
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.pause.error.paused.title", "", "commands.music.pause.error.paused.title", "",
"commands.music.pause.error.paused.description", e.getRethinkServer().getPrefix()) "commands.music.pause.error.paused.description", e.getMongoServer().getPrefix())
.build()).queue(); .build()).queue();
} }
} else { } else {

2
src/main/java/one/bbn/hadder/commands/music/PlayCommand.java
View file

@ -30,7 +30,7 @@ public class PlayCommand implements Command {
public void executed(String[] args, CommandEvent e) { public void executed(String[] args, CommandEvent e) {
if (args.length > 0) { if (args.length > 0) {
if (e.getMember().getVoiceState().inVoiceChannel()) { if (e.getMember().getVoiceState().inVoiceChannel()) {
String input = e.getMessage().getContentRaw().replaceFirst(e.getRethinkServer().getPrefix() + "play ", "").replaceFirst(e.getRethinkUser().getPrefix() + "play ", ""); String input = e.getMessage().getContentRaw().replaceFirst(e.getMongoServer().getPrefix() + "play ", "").replaceFirst(e.getMongoUser().getPrefix() + "play ", "");
try { try {
new URL(input).toURI(); new URL(input).toURI();
Message msg = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, Message msg = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,

8
src/main/java/one/bbn/hadder/commands/owner/BlacklistCommand.java
View file

@ -20,7 +20,7 @@ import one.bbn.hadder.commands.Command;
import one.bbn.hadder.commands.CommandEvent; import one.bbn.hadder.commands.CommandEvent;
import one.bbn.hadder.core.Perm; import one.bbn.hadder.core.Perm;
import one.bbn.hadder.core.Perms; import one.bbn.hadder.core.Perms;
import one.bbn.hadder.db.RethinkUser; import one.bbn.hadder.db.MongoUser;
import one.bbn.hadder.utils.MessageEditor; import one.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;
@ -41,8 +41,8 @@ public class BlacklistCommand implements Command {
case "add": case "add":
case "remove": case "remove":
if (args.length == 3 && e.getMessage().getMentionedUsers().size() == 1) { if (args.length == 3 && e.getMessage().getMentionedUsers().size() == 1) {
RethinkUser u = new RethinkUser(e.getRethink().getObjectByID("user", e.getMessage().getMentionedUsers().get(0).getId()), e.getRethink()); MongoUser u = new MongoUser(e.getMongo().getObjectByID("user", e.getMessage().getMentionedUsers().get(0).getId()), e.getMongo());
String blacklisted = e.getRethinkUser().getBlacklisted(); String blacklisted = e.getMongoUser().getBlacklisted();
List<String> commands = new ArrayList<>(); List<String> commands = new ArrayList<>();
if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
if (args[0].equalsIgnoreCase("add")) commands.addAll(Arrays.asList(args[1].split(","))); if (args[0].equalsIgnoreCase("add")) commands.addAll(Arrays.asList(args[1].split(",")));
@ -65,7 +65,7 @@ public class BlacklistCommand implements Command {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
for (User user : e.getJDA().getUsers()) { for (User user : e.getJDA().getUsers()) {
if (!user.getId().equals(e.getJDA().getSelfUser().getId())) { if (!user.getId().equals(e.getJDA().getSelfUser().getId())) {
RethinkUser u = new RethinkUser(e.getRethink().getObjectByID("user", user.getId()), e.getRethink()); MongoUser u = new MongoUser(e.getMongo().getObjectByID("user", user.getId()), e.getMongo());
String blacklisted = u.getBlacklisted(); String blacklisted = u.getBlacklisted();
if (!"none".equals(blacklisted)) { if (!"none".equals(blacklisted)) {
stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n"); stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");

2
src/main/java/one/bbn/hadder/commands/owner/EvalCommand.java
View file

@ -45,7 +45,7 @@ public class EvalCommand implements Command {
} }
engine.put("msg".toLowerCase(), e.getMessage()); engine.put("msg".toLowerCase(), e.getMessage());
engine.put("shardmanager".toLowerCase(), Hadder.shardManager); engine.put("shardmanager".toLowerCase(), Hadder.shardManager);
engine.put("rethink".toLowerCase(), e.getRethink()); engine.put("rethink".toLowerCase(), e.getMongo());
engine.put("e".toLowerCase(), e); engine.put("e".toLowerCase(), e);
engine.put("jda".toLowerCase(), e.getJDA()); engine.put("jda".toLowerCase(), e.getJDA());
engine.put("message".toLowerCase(), e.getMessage()); engine.put("message".toLowerCase(), e.getMessage());

4
src/main/java/one/bbn/hadder/commands/settings/LanguageCommand.java
View file

@ -58,14 +58,14 @@ public class LanguageCommand implements Command {
} }
public void setLanguage(String language_code, String language, CommandEvent e) { public void setLanguage(String language_code, String language, CommandEvent e) {
e.getRethinkUser().setLanguage(language_code); e.getMongoUser().setLanguage(language_code);
e.getTextChannel() e.getTextChannel()
.sendMessage( .sendMessage(
e.getMessageEditor() e.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title", .getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title",
"", "commands.settings.language.success.description", language) "", "commands.settings.language.success.description", language)
.build()).queue(); .build()).queue();
e.getRethinkUser().push(); e.getMongoUser().push();
} }
@Override @Override

4
src/main/java/one/bbn/hadder/commands/settings/UserPrefixCommand.java
View file

@ -24,14 +24,14 @@ public class UserPrefixCommand implements Command {
public void executed(String[] args, CommandEvent e) { public void executed(String[] args, CommandEvent e) {
if (args.length == 1) { if (args.length == 1) {
e.getRethinkUser().setPrefix(args[0]); e.getMongoUser().setPrefix(args[0]);
e.getTextChannel() e.getTextChannel()
.sendMessage(e.getMessageEditor() .sendMessage(e.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "", .getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "",
"commands.settings.prefix.success.description", args[0]) "commands.settings.prefix.success.description", args[0])
.build()) .build())
.queue(); .queue();
e.getRethinkUser().push(); e.getMongoUser().push();
} else e.getHelpCommand().sendHelp(this, e); } else e.getHelpCommand().sendHelp(this, e);
} }

14
src/main/java/one/bbn/hadder/core/CommandHandler.java
View file

@ -20,9 +20,9 @@ import one.bbn.hadder.audio.AudioManager;
import one.bbn.hadder.commands.Command; import one.bbn.hadder.commands.Command;
import one.bbn.hadder.commands.CommandEvent; import one.bbn.hadder.commands.CommandEvent;
import one.bbn.hadder.commands.general.HelpCommand; import one.bbn.hadder.commands.general.HelpCommand;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkServer; import one.bbn.hadder.db.MongoServer;
import one.bbn.hadder.db.RethinkUser; import one.bbn.hadder.db.MongoUser;
import one.bbn.hadder.utils.EventWaiter; import one.bbn.hadder.utils.EventWaiter;
import one.bbn.hadder.utils.MessageEditor; import one.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@ -42,7 +42,7 @@ public class CommandHandler {
this.helpCommand = helpCommand; this.helpCommand = helpCommand;
} }
public void handle(MessageReceivedEvent event, Rethink rethink, String prefix, AudioManager audioManager, RethinkUser rethinkUser, RethinkServer rethinkServer) { public void handle(MessageReceivedEvent event, Mongo mongo, String prefix, AudioManager audioManager, MongoUser mongoUser, MongoServer mongoServer) {
String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0]; String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0];
for (Command cmd : commandList) { for (Command cmd : commandList) {
for (String label : cmd.labels()) { for (String label : cmd.labels()) {
@ -53,8 +53,8 @@ public class CommandHandler {
String[] args = argString.split(" "); String[] args = argString.split(" ");
if (args.length > 0 && args[0].equals("")) args = new String[0]; if (args.length > 0 && args[0].equals("")) args = new String[0];
CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink, CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), mongo,
config, this, helpCommand, new MessageEditor(rethinkUser, event.getAuthor()), new EventWaiter(), audioManager, rethinkUser, rethinkServer); config, this, helpCommand, new MessageEditor(mongoUser, event.getAuthor()), new EventWaiter(), audioManager, mongoUser, mongoServer);
if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) { if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) { for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
if (!perm.check(commandEvent)) { if (!perm.check(commandEvent)) {
@ -68,7 +68,7 @@ public class CommandHandler {
} }
boolean run = true; boolean run = true;
String blacklisted = rethinkUser.getBlacklisted(); String blacklisted = mongoUser.getBlacklisted();
if (!"none".equals(blacklisted)) { if (!"none".equals(blacklisted)) {
for (String BLLabel : blacklisted.split(",")) { for (String BLLabel : blacklisted.split(",")) {
if (Arrays.asList(cmd.labels()).contains(BLLabel)) { if (Arrays.asList(cmd.labels()).contains(BLLabel)) {

160
src/main/java/one/bbn/hadder/db/Mongo.java Normal file
View file

@ -0,0 +1,160 @@
/*
* Copyright 2019-2020 GregTCLTK and Schlauer-Hax
*
* Licensed under the GNU Affero General Public License, Version 3.0;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.gnu.org/licenses/agpl-3.0.en.html
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package one.bbn.hadder.db;
import com.mongodb.BasicDBObject;
import com.mongodb.client.*;
import com.rethinkdb.gen.exc.ReqlNonExistenceError;
import one.bbn.hadder.core.Config;
import org.bson.Document;
import org.json.JSONException;
import org.json.JSONObject;
import java.lang.reflect.Field;
public class Mongo {
MongoClient client;
MongoDatabase db;
Config config;
public Mongo(Config config) {
this.config = config;
}
public void connect() {
client = MongoClients.create("mongodb://" + config.getDatabaseUsername() + ":" + config.getDatabasePassword() + "@" + config.getDatabaseIP() + ":" + config.getDatabasePort() + "/?authSource=admin");
db = client.getDatabase("Hadder");
}
public Object getByID(String collection_name, String where, String what, String column) {
MongoCollection<Document> collection = db.getCollection(collection_name);
BasicDBObject whereQuery = new BasicDBObject();
whereQuery.put(where, what);
FindIterable<Document> it = collection.find(whereQuery);
return it.cursor().next().get(column);
}
public JSONObject getObjectByID(String collection, String id) {
BasicDBObject whereQuery = new BasicDBObject();
whereQuery.put("id", id);
String response = db.getCollection(collection).find(whereQuery).cursor().next().toJson();
try {
return new JSONObject(response);
} catch (JSONException e) {
insertUser(id);
String response2 = db.getCollection(collection).find(whereQuery).cursor().next().toJson();
try {
return new JSONObject(response2);
} catch (JSONException ex) {
ex.printStackTrace();
return null;
}
}
}
public void remove(String table, String where, String value) {
BasicDBObject whereQuery = new BasicDBObject();
whereQuery.put(where, value);
client.getDatabase("VoiceAnalyzer").getCollection(table).deleteOne(whereQuery);
}
public void insert(String table, Document doc) {
client.getDatabase("VoiceAnalyzer").getCollection(table).insertOne(doc);
}
public void insertUser(String id) {
this.insert("user", new Document("id", id)
.append("prefix", "h.")
.append("language", "en")
.append("blacklisted", "none"));
}
public void insertGuild(String id) {
this.insert("server", new Document("id", id)
.append("prefix", "h.")
.append("message_id", "")
.append("role_id", "")
.append("invite_detect", false)
.append("starboard", "")
.append("neededstars", "4")
);
}
public void push(MongoServer server) {
Document object = new Document();
for (Field field : server.getClass().getDeclaredFields()) {
if (!field.getName().equals("mongo")) {
try {
object.append(field.getName(), field.get(server));
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
BasicDBObject whereQuery = new BasicDBObject();
whereQuery.put("id", server.getId());
BasicDBObject updateObject = new BasicDBObject();
updateObject.put("$set", object);
db.getCollection("server").updateOne(whereQuery, updateObject);
}
public void push(MongoUser user) {
Document object = new Document();
for (Field field : user.getClass().getDeclaredFields()) {
if (!field.getName().equals("mongo")) {
try {
object.append(field.getName(), field.get(user));
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
BasicDBObject whereQuery = new BasicDBObject();
whereQuery.put("id", user.getId());
BasicDBObject updateObject = new BasicDBObject();
updateObject.put("$set", object);
db.getCollection("user").updateOne(whereQuery, updateObject);
}
public boolean hasStarboardMessage(String message_id) {
try {
this.getByID("stars", "id", message_id, "guild");
return true;
} catch (ReqlNonExistenceError e) {
return false;
}
}
public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {
this.insert("stars", new Document("id", message_id).append("guild", guild_id).append("starboardmsg", starboard_message_id));
}
public String getStarboardMessage(String message_id) {
return (String) this.getByID("stars", "id", message_id, "starboardmsg");
}
public void removeStarboardMessage(String message_id) {
this.remove("stars", "id", message_id);
}
}

12
src/main/java/one/bbn/hadder/db/RethinkServer.java → src/main/java/one/bbn/hadder/db/MongoServer.java
View file

@ -20,9 +20,9 @@ import org.json.JSONObject;
import java.lang.reflect.Field; import java.lang.reflect.Field;
public class RethinkServer { public class MongoServer {
private Rethink rethink; private Mongo mongo;
public String accept_emote = ""; public String accept_emote = "";
public String decline_emote = ""; public String decline_emote = "";
@ -34,9 +34,9 @@ public class RethinkServer {
public String role_id = ""; public String role_id = "";
public String starboard = ""; public String starboard = "";
public RethinkServer(JSONObject object, Rethink rethink) { public MongoServer(JSONObject object, Mongo mongo) {
for (Field field : this.getClass().getDeclaredFields()) { for (Field field : this.getClass().getDeclaredFields()) {
if (!field.getName().equals("rethink")) { if (!field.getName().equals("mongo")) {
try { try {
if (object.has(field.getName())) if (object.has(field.getName()))
field.set(this, object.get(field.getName())); field.set(this, object.get(field.getName()));
@ -45,7 +45,7 @@ public class RethinkServer {
} }
} }
} }
this.rethink = rethink; this.mongo = mongo;
} }
public String getAcceptEmote() { public String getAcceptEmote() {
@ -128,6 +128,6 @@ public class RethinkServer {
} }
public void push() { public void push() {
rethink.push(this); mongo.push(this);
} }
} }

16
src/main/java/one/bbn/hadder/db/RethinkUser.java → src/main/java/one/bbn/hadder/db/MongoUser.java
View file

@ -20,18 +20,18 @@ import org.json.JSONObject;
import java.lang.reflect.Field; import java.lang.reflect.Field;
public class RethinkUser { public class MongoUser {
private Rethink rethink; private Mongo mongo;
public String id; public String id;
public String prefix = "h."; public String prefix = "h.";
public String language = "en"; public String language = "en";
public String blacklisted = "none"; public String blacklisted = "none";
public RethinkUser(JSONObject object, Rethink rethink) { public MongoUser(JSONObject object, Mongo mongo) {
for (Field field : this.getClass().getDeclaredFields()) { for (Field field : this.getClass().getDeclaredFields()) {
if (!field.getName().equals("rethink")) { if (!field.getName().equals("mongo")) {
try { try {
if (object.has(field.getName())) if (object.has(field.getName()))
field.set(this, object.getString(field.getName())); field.set(this, object.getString(field.getName()));
@ -40,11 +40,11 @@ public class RethinkUser {
} }
} }
} }
this.rethink = rethink; this.mongo = mongo;
} }
public Rethink getRethink() { public Mongo getMongo() {
return rethink; return mongo;
} }
public String getId() { public String getId() {
@ -76,6 +76,6 @@ public class RethinkUser {
} }
public void push() { public void push() {
rethink.push(this); mongo.push(this);
} }
} }

176
src/main/java/one/bbn/hadder/db/Rethink.java
View file

@ -1,176 +0,0 @@
/*
* Copyright 2019-2020 GregTCLTK and Schlauer-Hax
*
* Licensed under the GNU Affero General Public License, Version 3.0;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.gnu.org/licenses/agpl-3.0.en.html
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package one.bbn.hadder.db;
import one.bbn.hadder.core.Config;
import com.rethinkdb.RethinkDB;
import com.rethinkdb.gen.exc.ReqlNonExistenceError;
import com.rethinkdb.gen.exc.ReqlOpFailedError;
import com.rethinkdb.net.Connection;
import org.json.JSONException;
import org.json.JSONObject;
import java.lang.reflect.Field;
public class Rethink {
private final RethinkDB r = RethinkDB.r;
private Connection conn;
private final Config config;
public Rethink(Config config) {
this.config = config;
}
public void connect() {
try {
conn = r.connection()
.hostname(config.getDatabaseIP())
.db(config.getDatabaseName())
.port(config.getDatabasePort())
.user(config.getDatabaseUsername(), config.getDatabasePassword())
.connect();
System.out.println("DB CONNECTED");
} catch (Exception e) {
e.printStackTrace();
System.out.println("DB CONNECTION FAILED");
}
}
public Object getByID(String table, String where, String column) {
return r.table(table).get(where).getField(column).run(conn).first();
}
public JSONObject getObjectByID(String table, String id) {
String response = String.valueOf(r.table(table).get(id).toJson().run(conn).first());
try {
return new JSONObject(response);
} catch (JSONException e) {
insertUser(id);
String response2 = String.valueOf(r.table(table).get(id).toJson().run(conn).first());
try {
return new JSONObject(response2);
} catch (JSONException ex) {
ex.printStackTrace();
return null;
}
}
}
public void insert(String table, Object object) {
try {
r.table(table).insert(object).run(conn);
} catch (ClassCastException e) {
e.printStackTrace();
}
}
public void remove(String table, String where, String value) {
r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).delete().run(conn);
}
public void setup() {
try {
r.dbCreate("Hadder").run(conn);
} catch (ReqlOpFailedError e) {
System.out.println(e.getMessage());
}
try {
r.tableCreate("server").run(conn);
} catch (ReqlOpFailedError e) {
System.out.println(e.getMessage());
}
try {
r.tableCreate("user").run(conn);
} catch (ReqlOpFailedError e) {
System.out.println(e.getMessage());
}
try {
r.tableCreate("stars").run(conn);
} catch (ReqlOpFailedError e) {
System.out.println(e.getMessage());
}
}
public void insertGuild(String id) {
this.insert("server", r
.hashMap("id", id)
.with("prefix", "h.")
.with("message_id", "")
.with("role_id", "")
.with("invite_detect", false)
.with("starboard", "")
.with("neededstars", "4")
);
}
public void insertUser(String id) {
this.insert("user", r
.hashMap("id", id)
.with("prefix", "h.")
.with("language", "en")
.with("blacklisted", "none"));
}
public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {
this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboard_message_id));
}
public String getStarboardMessage(String message_id) {
return (String) this.getByID("stars", message_id, "starboardmsg");
}
public void removeStarboardMessage(String message_id) {
this.remove("stars", "id", message_id);
}
public boolean hasStarboardMessage(String message_id) {
try {
this.getByID("stars", message_id, "guild");
return true;
} catch (ReqlNonExistenceError e) {
return false;
}
}
public void push(RethinkServer server) {
JSONObject object = new JSONObject();
for (Field field : server.getClass().getDeclaredFields()) {
if (!field.getName().equals("rethink")) {
try {
object.put(field.getName(), field.get(server));
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
r.table("server").get(server.getId()).update(object.toMap()).run(conn);
}
public void push(RethinkUser user) {
JSONObject object = new JSONObject();
for (Field field : user.getClass().getDeclaredFields()) {
if (!field.getName().equals("rethink")) {
try {
object.put(field.getName(), field.get(user));
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
r.table("user").get(user.getId()).update(object.toMap()).run(conn);
}
}

24
src/main/java/one/bbn/hadder/listener/CommandListener.java
View file

@ -18,9 +18,9 @@ package one.bbn.hadder.listener;
import one.bbn.hadder.audio.AudioManager; import one.bbn.hadder.audio.AudioManager;
import one.bbn.hadder.core.CommandHandler; import one.bbn.hadder.core.CommandHandler;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkServer; import one.bbn.hadder.db.MongoServer;
import one.bbn.hadder.db.RethinkUser; import one.bbn.hadder.db.MongoUser;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.ChannelType;
@ -33,12 +33,12 @@ import java.time.Instant;
public class CommandListener extends ListenerAdapter { public class CommandListener extends ListenerAdapter {
private final Rethink rethink; private final Mongo mongo;
private final CommandHandler handler; private final CommandHandler handler;
private final AudioManager audioManager; private final AudioManager audioManager;
public CommandListener(Rethink rethink, CommandHandler handler, AudioManager audioManager) { public CommandListener(Mongo mongo, CommandHandler handler, AudioManager audioManager) {
this.rethink = rethink; this.mongo = mongo;
this.handler = handler; this.handler = handler;
this.audioManager = audioManager; this.audioManager = audioManager;
} }
@ -48,19 +48,19 @@ public class CommandListener extends ListenerAdapter {
if (e.isFromType(ChannelType.TEXT) && !e.getAuthor().isBot()) { if (e.isFromType(ChannelType.TEXT) && !e.getAuthor().isBot()) {
if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_WRITE)) { if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_WRITE)) {
if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) {
RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", e.getAuthor().getId()), rethink); MongoUser mongoUser = new MongoUser(mongo.getObjectByID("user", e.getAuthor().getId()), mongo);
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", e.getGuild().getId()), mongo);
rethinkUser.push(); mongoUser.push();
rethinkServer.push(); mongoServer.push();
String[] prefixes = { String[] prefixes = {
rethinkUser.getPrefix(), rethinkServer.getPrefix(), mongoUser.getPrefix(), mongoServer.getPrefix(),
e.getGuild().getSelfMember().getAsMention() + " ", e.getGuild().getSelfMember().getAsMention(), e.getGuild().getSelfMember().getAsMention() + " ", e.getGuild().getSelfMember().getAsMention(),
e.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", e.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ",
e.getGuild().getSelfMember().getAsMention().replace("@", "@!") e.getGuild().getSelfMember().getAsMention().replace("@", "@!")
}; };
for (String prefix : prefixes) { for (String prefix : prefixes) {
if (e.getMessage().getContentRaw().startsWith(prefix)) { if (e.getMessage().getContentRaw().startsWith(prefix)) {
handler.handle(e, rethink, prefix, audioManager, rethinkUser, rethinkServer); handler.handle(e, mongo, prefix, audioManager, mongoUser, mongoServer);
return; return;
} }
} }

14
src/main/java/one/bbn/hadder/listener/GuildListener.java
View file

@ -17,7 +17,7 @@
package one.bbn.hadder.listener; package one.bbn.hadder.listener;
import one.bbn.hadder.core.Config; import one.bbn.hadder.core.Config;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.utils.BotList; import one.bbn.hadder.utils.BotList;
import one.bbn.hadder.utils.MessageEditor; import one.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
@ -30,11 +30,11 @@ import java.time.Instant;
public class GuildListener extends ListenerAdapter { public class GuildListener extends ListenerAdapter {
private final Rethink rethink; private final Mongo mongo;
private final Config config; private final Config config;
public GuildListener(Rethink rethink, Config config) { public GuildListener(Mongo mongo, Config config) {
this.rethink = rethink; this.mongo = mongo;
this.config = config; this.config = config;
} }
@ -42,12 +42,12 @@ public class GuildListener extends ListenerAdapter {
new Thread(() -> { new Thread(() -> {
for (Member member : e.getGuild().getMembers()) { for (Member member : e.getGuild().getMembers()) {
if (!member.getUser().getId().equals(e.getJDA().getSelfUser().getId())) { if (!member.getUser().getId().equals(e.getJDA().getSelfUser().getId())) {
rethink.insertUser(member.getUser().getId()); mongo.insertUser(member.getUser().getId());
} }
} }
}).start(); }).start();
rethink.insertGuild(e.getGuild().getId()); mongo.insertGuild(e.getGuild().getId());
e.getJDA().getTextChannelById("759783393230979142").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO) e.getJDA().getTextChannelById("759783393230979142").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
.setTitle("Joined Server") .setTitle("Joined Server")
.setThumbnail(e.getGuild().getIconUrl()) .setThumbnail(e.getGuild().getIconUrl())
@ -79,7 +79,7 @@ public class GuildListener extends ListenerAdapter {
public void onGuildMemberJoin(GuildMemberJoinEvent e) { public void onGuildMemberJoin(GuildMemberJoinEvent e) {
if (!e.getUser().getId().equals(e.getJDA().getSelfUser().getId())) { if (!e.getUser().getId().equals(e.getJDA().getSelfUser().getId())) {
rethink.insertUser(e.getUser().getId()); mongo.insertUser(e.getUser().getId());
} }
} }
} }

18
src/main/java/one/bbn/hadder/listener/InviteLinkListener.java
View file

@ -16,8 +16,8 @@
package one.bbn.hadder.listener; package one.bbn.hadder.listener;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkServer; import one.bbn.hadder.db.MongoServer;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
@ -35,10 +35,10 @@ import javax.annotation.Nonnull;
public class InviteLinkListener extends ListenerAdapter { public class InviteLinkListener extends ListenerAdapter {
private Rethink rethink; private Mongo mongo;
public InviteLinkListener(Rethink rethink) { public InviteLinkListener(Mongo mongo) {
this.rethink = rethink; this.mongo = mongo;
} }
@Override @Override
@ -68,12 +68,12 @@ public class InviteLinkListener extends ListenerAdapter {
} }
public void scanMessage(Guild guild, Message message, Member member) { public void scanMessage(Guild guild, Message message, Member member) {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink); MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", guild.getId()), mongo);
if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && mongoServer.hasInviteDetect()) {
checkInvite(message, "discord.gg/"); checkInvite(message, "discord.gg/");
} else if (message.getContentRaw().contains("discord.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { } else if (message.getContentRaw().contains("discord.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && mongoServer.hasInviteDetect()) {
checkInvite(message, "discord.com/invite/"); checkInvite(message, "discord.com/invite/");
} else if (message.getContentRaw().contains("discordapp.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { } else if (message.getContentRaw().contains("discordapp.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && mongoServer.hasInviteDetect()) {
checkInvite(message, "discordapp.com/invite/"); checkInvite(message, "discordapp.com/invite/");
} }
} }

20
src/main/java/one/bbn/hadder/listener/MentionListener.java
View file

@ -17,9 +17,9 @@
package one.bbn.hadder.listener; package one.bbn.hadder.listener;
import one.bbn.hadder.core.Config; import one.bbn.hadder.core.Config;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkServer; import one.bbn.hadder.db.MongoServer;
import one.bbn.hadder.db.RethinkUser; import one.bbn.hadder.db.MongoUser;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@ -33,19 +33,19 @@ import java.util.Random;
public class MentionListener extends ListenerAdapter { public class MentionListener extends ListenerAdapter {
private final Rethink rethink; private final Mongo mongo;
private final Config config; private final Config config;
public MentionListener(Rethink rethink, Config config) { public MentionListener(Mongo mongo, Config config) {
this.rethink = rethink; this.mongo = mongo;
this.config = config; this.config = config;
} }
@Override @Override
public void onMessageReceived(@Nonnull MessageReceivedEvent e) { public void onMessageReceived(@Nonnull MessageReceivedEvent e) {
if (!e.getAuthor().isBot() && e.isFromType(ChannelType.TEXT)) { if (!e.getAuthor().isBot() && e.isFromType(ChannelType.TEXT)) {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", e.getGuild().getId()), mongo);
RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", e.getAuthor().getId()), rethink); MongoUser mongoUser = new MongoUser(mongo.getObjectByID("user", e.getAuthor().getId()), mongo);
if (e.isFromType(ChannelType.TEXT) && (e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention()) || if (e.isFromType(ChannelType.TEXT) && (e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention()) ||
e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) { e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) {
@ -62,8 +62,8 @@ public class MentionListener extends ListenerAdapter {
EmbedBuilder builder = new EmbedBuilder() EmbedBuilder builder = new EmbedBuilder()
.setTitle("Hi!") .setTitle("Hi!")
.addField("Version", version, false) .addField("Version", version, false)
.addField("User-Prefix", rethinkUser.getPrefix(), true) .addField("User-Prefix", mongoUser.getPrefix(), true)
.addField("Guild-Prefix", rethinkServer.getPrefix(), true) .addField("Guild-Prefix", mongoServer.getPrefix(), true)
.addField("Join our Dev Server!", "[Click here!](https://discord.gg/nPwjaJk)", true) .addField("Join our Dev Server!", "[Click here!](https://discord.gg/nPwjaJk)", true)
.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)", false) .addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)", false)
.addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false); .addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false);

14
src/main/java/one/bbn/hadder/listener/PrivateMessageListener.java
View file

@ -16,8 +16,8 @@
package one.bbn.hadder.listener; package one.bbn.hadder.listener;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkUser; import one.bbn.hadder.db.MongoUser;
import one.bbn.hadder.utils.MessageEditor; import one.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.ChannelType;
@ -30,18 +30,18 @@ import java.time.Instant;
public class PrivateMessageListener extends ListenerAdapter { public class PrivateMessageListener extends ListenerAdapter {
private final Rethink rethink; private final Mongo mongo;
public PrivateMessageListener(Rethink rethink) { public PrivateMessageListener(Mongo mongo) {
this.rethink = rethink; this.mongo = mongo;
} }
public void onMessageReceived(MessageReceivedEvent e) { public void onMessageReceived(MessageReceivedEvent e) {
if (e.isFromType(ChannelType.PRIVATE) && !e.getAuthor().getId().equals(e.getJDA().getSelfUser().getId())) { if (e.isFromType(ChannelType.PRIVATE) && !e.getAuthor().getId().equals(e.getJDA().getSelfUser().getId())) {
PrivateChannel Skidder = e.getJDA().getUserById("401817301919465482").openPrivateChannel().complete(); PrivateChannel Skidder = e.getJDA().getUserById("401817301919465482").openPrivateChannel().complete();
PrivateChannel Hax = e.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); PrivateChannel Hax = e.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
RethinkUser HaxUser = new RethinkUser(rethink.getObjectByID("user", "261083609148948488"), rethink); MongoUser HaxUser = new MongoUser(mongo.getObjectByID("user", "261083609148948488"), mongo);
RethinkUser SkidderUser = new RethinkUser(rethink.getObjectByID("user", "261083609148948488"), rethink); MongoUser SkidderUser = new MongoUser(mongo.getObjectByID("user", "261083609148948488"), mongo);
Skidder.sendMessage(new MessageEditor(SkidderUser, e.getJDA().getUserById("401817301919465482")).getMessage(MessageEditor.MessageType.INFO) Skidder.sendMessage(new MessageEditor(SkidderUser, e.getJDA().getUserById("401817301919465482")).getMessage(MessageEditor.MessageType.INFO)
.setTitle("New DM by " + e.getAuthor().getAsTag()) .setTitle("New DM by " + e.getAuthor().getAsTag())

19
src/main/java/one/bbn/hadder/listener/ReadyListener.java
View file

@ -17,9 +17,6 @@
package one.bbn.hadder.listener; package one.bbn.hadder.listener;
import one.bbn.hadder.core.Config; import one.bbn.hadder.core.Config;
import one.bbn.hadder.db.Rethink;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.ReadyEvent; import net.dv8tion.jda.api.events.ReadyEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
@ -27,28 +24,14 @@ import javax.annotation.Nonnull;
public class ReadyListener extends ListenerAdapter { public class ReadyListener extends ListenerAdapter {
private final Rethink rethink;
private final Config config; private final Config config;
public ReadyListener(Rethink rethink, Config config) { public ReadyListener(Config config) {
this.rethink = rethink;
this.config = config; this.config = config;
} }
@Override @Override
public void onReady(@Nonnull ReadyEvent e) { public void onReady(@Nonnull ReadyEvent e) {
rethink.setup();
new Thread(() -> {
for (User user : e.getJDA().getUsers()) {
if (!user.getId().equals(e.getJDA().getSelfUser().getId())) {
rethink.insertUser(user.getId());
}
}
for (Guild g : e.getJDA().getGuilds()) {
rethink.insertGuild(g.getId());
}
}).start();
//TODO: Renew all bot lists //TODO: Renew all bot lists
//new BotList(config).post(); //new BotList(config).post();
} }

36
src/main/java/one/bbn/hadder/listener/RulesListener.java
View file

@ -16,37 +16,37 @@
package one.bbn.hadder.listener; package one.bbn.hadder.listener;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkServer; import one.bbn.hadder.db.MongoServer;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
public class RulesListener extends ListenerAdapter { public class RulesListener extends ListenerAdapter {
private final Rethink rethink; private final Mongo mongo;
public RulesListener(Rethink rethink) { public RulesListener(Mongo mongo) {
this.rethink = rethink; this.mongo = mongo;
} }
@Override @Override
public void onMessageReactionAdd(MessageReactionAddEvent e) { public void onMessageReactionAdd(MessageReactionAddEvent e) {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", e.getGuild().getId()), mongo);
if (e.getMessageId().equals(rethinkServer.getMessageID()) && !e.getUser().isBot()) { if (e.getMessageId().equals(mongoServer.getMessageID()) && !e.getUser().isBot()) {
if (e.getReactionEmote().isEmote()) { if (e.getReactionEmote().isEmote()) {
if (rethinkServer.getAcceptEmote().equals(e.getReactionEmote().getId())) { if (mongoServer.getAcceptEmote().equals(e.getReactionEmote().getId())) {
addRole(e); addRole(e);
} else if (rethinkServer.getDeclineEmote().equals(e.getReactionEmote().getId())) { } else if (mongoServer.getDeclineEmote().equals(e.getReactionEmote().getId())) {
e.getReaction().removeReaction(e.getUser()).queue(); e.getReaction().removeReaction(e.getUser()).queue();
if (e.getGuild().getSelfMember().canInteract(e.getMember())) { if (e.getGuild().getSelfMember().canInteract(e.getMember())) {
e.getMember().kick().reason("Declined the rules"); e.getMember().kick().reason("Declined the rules");
} }
} }
} else if (e.getReactionEmote().isEmoji()) { } else if (e.getReactionEmote().isEmoji()) {
if (rethinkServer.getAcceptEmote().equals(e.getReactionEmote().getEmoji())) { if (mongoServer.getAcceptEmote().equals(e.getReactionEmote().getEmoji())) {
addRole(e); addRole(e);
} else if (rethinkServer.getDeclineEmote().equals(e.getReactionEmote().getEmoji())) { } else if (mongoServer.getDeclineEmote().equals(e.getReactionEmote().getEmoji())) {
e.getReaction().removeReaction(e.getUser()).queue(); e.getReaction().removeReaction(e.getUser()).queue();
if (e.getGuild().getSelfMember().canInteract(e.getMember())) { if (e.getGuild().getSelfMember().canInteract(e.getMember())) {
e.getMember().kick().reason("Declined the rules"); e.getMember().kick().reason("Declined the rules");
@ -57,18 +57,18 @@ public class RulesListener extends ListenerAdapter {
} }
private void addRole(MessageReactionAddEvent e) { private void addRole(MessageReactionAddEvent e) {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", e.getGuild().getId()), mongo);
if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRoleID()))) { if (e.getMember().getRoles().contains(e.getGuild().getRoleById(mongoServer.getRoleID()))) {
e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(mongoServer.getRoleID())).reason("Accepted rules").queue();
} else } else
e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(mongoServer.getRoleID())).reason("Accepted rules").queue();
} }
@Override @Override
public void onMessageReactionRemove(MessageReactionRemoveEvent e) { public void onMessageReactionRemove(MessageReactionRemoveEvent e) {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", e.getGuild().getId()), mongo);
if (e.getMessageId().equals(rethinkServer.getMessageID()) && !e.getUser().isBot()) { if (e.getMessageId().equals(mongoServer.getMessageID()) && !e.getUser().isBot()) {
e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Withdrawal of the acceptance of the rules").queue(); e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(mongoServer.getRoleID())).reason("Withdrawal of the acceptance of the rules").queue();
} }
} }
} }

30
src/main/java/one/bbn/hadder/listener/StarboardListener.java
View file

@ -16,8 +16,8 @@
package one.bbn.hadder.listener; package one.bbn.hadder.listener;
import one.bbn.hadder.db.Rethink; import one.bbn.hadder.db.Mongo;
import one.bbn.hadder.db.RethinkServer; import one.bbn.hadder.db.MongoServer;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.MessageBuilder;
import net.dv8tion.jda.api.entities.MessageReaction; import net.dv8tion.jda.api.entities.MessageReaction;
@ -30,10 +30,10 @@ import javax.annotation.Nonnull;
public class StarboardListener extends ListenerAdapter { public class StarboardListener extends ListenerAdapter {
private final Rethink rethink; private final Mongo mongo;
public StarboardListener(Rethink rethink) { public StarboardListener(Mongo mongo) {
this.rethink = rethink; this.mongo = mongo;
} }
@Override @Override
@ -48,9 +48,9 @@ public class StarboardListener extends ListenerAdapter {
public void update(GenericMessageReactionEvent e) { public void update(GenericMessageReactionEvent e) {
if (e.getReaction().getReactionEmote().getName().equals("⭐")) { if (e.getReaction().getReactionEmote().getName().equals("⭐")) {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); MongoServer mongoServer = new MongoServer(mongo.getObjectByID("server", e.getGuild().getId()), mongo);
if (!rethink.hasStarboardMessage(e.getMessageId())) { if (!mongo.hasStarboardMessage(e.getMessageId())) {
if (rethinkServer.hasStarboardChannel()) { if (mongoServer.hasStarboardChannel()) {
e.getTextChannel().retrieveMessageById(e.getMessageId()).queue( e.getTextChannel().retrieveMessageById(e.getMessageId()).queue(
msg -> { msg -> {
int stars = 0; int stars = 0;
@ -60,8 +60,8 @@ public class StarboardListener extends ListenerAdapter {
} }
} }
if (Integer.parseInt(rethinkServer.getNeededStars()) <= stars) { if (Integer.parseInt(mongoServer.getNeededStars()) <= stars) {
e.getGuild().getTextChannelById(rethinkServer.getStarboard()) e.getGuild().getTextChannelById(mongoServer.getStarboard())
.sendMessage(new MessageBuilder() .sendMessage(new MessageBuilder()
.setContent("⭐ 1" + " " + e.getTextChannel().getAsMention()) .setContent("⭐ 1" + " " + e.getTextChannel().getAsMention())
.setEmbed( .setEmbed(
@ -70,7 +70,7 @@ public class StarboardListener extends ListenerAdapter {
.setDescription(msg.getContentRaw()) .setDescription(msg.getContentRaw())
.setTimestamp(msg.getTimeCreated()).build()).build()).queue( .setTimestamp(msg.getTimeCreated()).build()).build()).queue(
starboardmsg -> { starboardmsg -> {
rethink.insertStarboardMessage(msg.getId(), e.getGuild().getId(), starboardmsg.getId()); mongo.insertStarboardMessage(msg.getId(), e.getGuild().getId(), starboardmsg.getId());
} }
); );
} }
@ -90,11 +90,11 @@ public class StarboardListener extends ListenerAdapter {
} }
int finalStars = stars; int finalStars = stars;
e.getGuild().getTextChannelById(rethinkServer.getStarboard()) e.getGuild().getTextChannelById(mongoServer.getStarboard())
.retrieveMessageById(rethink.getStarboardMessage(e.getMessageId())).queue( .retrieveMessageById(mongo.getStarboardMessage(e.getMessageId())).queue(
msg2 -> { msg2 -> {
if (Integer.parseInt(rethinkServer.getNeededStars()) <= finalStars) { if (Integer.parseInt(mongoServer.getNeededStars()) <= finalStars) {
msg2.editMessage(new MessageBuilder() msg2.editMessage(new MessageBuilder()
.setContent("⭐ " + finalStars + " " + e.getTextChannel().getAsMention()) .setContent("⭐ " + finalStars + " " + e.getTextChannel().getAsMention())
.setEmbed( .setEmbed(
@ -104,7 +104,7 @@ public class StarboardListener extends ListenerAdapter {
.setTimestamp(msg.getTimeCreated()).build()).build()).queue(); .setTimestamp(msg.getTimeCreated()).build()).build()).queue();
} else { } else {
msg2.delete().queue(); msg2.delete().queue();
rethink.removeStarboardMessage(msg.getId()); mongo.removeStarboardMessage(msg.getId());
} }
} }
); );

14
src/main/java/one/bbn/hadder/utils/MessageEditor.java
View file

@ -16,7 +16,7 @@
package one.bbn.hadder.utils; package one.bbn.hadder.utils;
import one.bbn.hadder.db.RethinkUser; import one.bbn.hadder.db.MongoUser;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;
@ -27,11 +27,11 @@ import java.util.ResourceBundle;
public class MessageEditor { public class MessageEditor {
private final RethinkUser rethinkUser; private final MongoUser mongoUser;
private final User user; private final User user;
public MessageEditor(RethinkUser rethinkUser, User user) { public MessageEditor(MongoUser mongoUser, User user) {
this.rethinkUser = rethinkUser; this.mongoUser = mongoUser;
this.user = user; this.user = user;
} }
@ -50,7 +50,7 @@ public class MessageEditor {
public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two, public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two,
String description, String description_extra, String description_extra_two) { String description, String description_extra, String description_extra_two) {
String language = (this.user != null) ? rethinkUser.getLanguage() : null; String language = (this.user != null) ? mongoUser.getLanguage() : null;
EmbedBuilder eb = this.getDefaultSettings(type); EmbedBuilder eb = this.getDefaultSettings(type);
if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!"".equals(description)) if (!"".equals(description))
@ -122,11 +122,11 @@ public class MessageEditor {
} }
public String getTerm(String string) { public String getTerm(String string) {
return this.handle(rethinkUser.getLanguage(), string, "", ""); return this.handle(mongoUser.getLanguage(), string, "", "");
} }
public String getTerm(String string, String extra, String extra_two) { public String getTerm(String string, String extra, String extra_two) {
return this.handle(rethinkUser.getLanguage(), string, extra, extra_two); return this.handle(mongoUser.getLanguage(), string, extra, extra_two);
} }
private String handle(String language_code, String string, String extra, String extra_two) { private String handle(String language_code, String string, String extra, String extra_two) {