diff --git a/src/main/java/discord/data/mining/DataMining.java b/src/main/java/discord/data/mining/DataMining.java index 2f7a0f7..b7b95c6 100644 --- a/src/main/java/discord/data/mining/DataMining.java +++ b/src/main/java/discord/data/mining/DataMining.java @@ -1,6 +1,6 @@ package discord.data.mining; -import discord.data.mining.listener.BotMessageListener; +import discord.data.mining.listener.GenericEventListener; import discord.data.mining.listener.MessageListener; import discord.data.mining.listener.ReadyListener; import net.dv8tion.jda.api.AccountType; @@ -30,7 +30,7 @@ public class DataMining { Thread.sleep(1500); for (String Token : botTokens) { - bots.add(new JDABuilder(AccountType.BOT).setAutoReconnect(true).setToken(Token).addEventListeners(new BotMessageListener()).build()); + bots.add(new JDABuilder(AccountType.BOT).setAutoReconnect(true).setToken(Token).addEventListeners(new GenericEventListener()).build()); } for (String Token : clientTokens) { diff --git a/src/main/java/discord/data/mining/core/DataLog.java b/src/main/java/discord/data/mining/core/DataLog.java index 394f5fc..5c340f3 100644 --- a/src/main/java/discord/data/mining/core/DataLog.java +++ b/src/main/java/discord/data/mining/core/DataLog.java @@ -18,30 +18,47 @@ public class DataLog { JDA BOT = DataMining.bots.get(DataMining.bot); if (event instanceof MessageReceivedEvent) { MessageReceivedEvent msgevent = (MessageReceivedEvent) event; - BOT.getTextChannelById(DataMining.MessageLog).sendMessage(new EmbedBuilder() - .setColor(Color.GREEN) - .setTimestamp(Instant.now()) - .setThumbnail(msgevent.getGuild().getIconUrl()) - .setAuthor(msgevent.getAuthor().getAsTag(), msgevent.getAuthor().getAvatarUrl(), msgevent.getAuthor().getAvatarUrl()) - .setTitle("New Message") - .addField("Guild Name", msgevent.getGuild().getName(), true) - .addField("Guild ID", msgevent.getGuild().getId(), true) - .addField("Guild Owner", msgevent.getGuild().getOwner().getUser().getAsTag(), true) - .build()).queue(); + if (!msgevent.getGuild().getId().equals("448554629282922527")) { + BOT.getTextChannelById(DataMining.MessageLog).sendMessage(new EmbedBuilder() + .setColor(Color.GREEN) + .setTimestamp(Instant.now()) + .setThumbnail(msgevent.getGuild().getIconUrl()) + .setAuthor(msgevent.getAuthor().getAsTag(), msgevent.getAuthor().getAvatarUrl(), msgevent.getAuthor().getAvatarUrl()) + .setTitle("New Message") + .addField("Guild Name", msgevent.getGuild().getName(), true) + .addField("Guild ID", msgevent.getGuild().getId(), true) + .addField("Guild Owner", msgevent.getGuild().getOwner().getUser().getAsTag(), true) + .addField("Content", "```" + msgevent.getMessage().getContentDisplay() + "```", false) + .build()).queue(); + } } else if (event instanceof MessageDeleteEvent) { MessageDeleteEvent msgevent = (MessageDeleteEvent) event; - BOT.getTextChannelById(DataMining.MessageLog).sendMessage(new EmbedBuilder() - .setColor(Color.RED) - .setTimestamp(Instant.now()) - .setThumbnail(msgevent.getGuild().getIconUrl()) - .setTitle("Message deleted") - .addField("Guild Name", msgevent.getGuild().getName(), true) - .addField("Guild ID", msgevent.getGuild().getId(), true) - .addField("Guild Owner", msgevent.getGuild().getOwner().getUser().getAsTag(), true) - .build()).queue(); + if (!msgevent.getGuild().getId().equals("448554629282922527")) { + BOT.getTextChannelById(DataMining.MessageLog).sendMessage(new EmbedBuilder() + .setColor(Color.RED) + .setTimestamp(Instant.now()) + .setThumbnail(msgevent.getGuild().getIconUrl()) + .setTitle("Message deleted") + .addField("Guild Name", msgevent.getGuild().getName(), true) + .addField("Guild ID", msgevent.getGuild().getId(), true) + .addField("Guild Owner", msgevent.getGuild().getOwner().getUser().getAsTag(), true) + .build()).queue(); + } } else if (event instanceof MessageReactionAddEvent) { MessageReactionAddEvent revent = (MessageReactionAddEvent) event; - // INSERT CODE HERE + if (!revent.getGuild().getId().equals("448554629282922527")) { + BOT.getTextChannelById(DataMining.ReactionLog).sendMessage(new EmbedBuilder() + .setColor(Color.GREEN) + .setTimestamp(Instant.now()) + .setThumbnail(revent.getGuild().getIconUrl()) + .setAuthor(revent.getMember().getUser().getAsTag(), revent.getMember().getUser().getAvatarUrl(), revent.getMember().getUser().getAvatarUrl()) + .setTitle("Reaction added") + .addField("Guild Name", revent.getGuild().getName(), true) + .addField("Guild ID", revent.getGuild().getId(), true) + .addField("Guild Owner", revent.getGuild().getOwner().getUser().getAsTag(), true) + .addField("Reaction", revent.getReaction().toString(), false) + .build()).queue(); + } } } } \ No newline at end of file diff --git a/src/main/java/discord/data/mining/listener/BotMessageListener.java b/src/main/java/discord/data/mining/listener/GenericEventListener.java similarity index 84% rename from src/main/java/discord/data/mining/listener/BotMessageListener.java rename to src/main/java/discord/data/mining/listener/GenericEventListener.java index ca77fe2..89e19b3 100644 --- a/src/main/java/discord/data/mining/listener/BotMessageListener.java +++ b/src/main/java/discord/data/mining/listener/GenericEventListener.java @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter; import javax.annotation.Nonnull; -public class BotMessageListener extends ListenerAdapter { +public class GenericEventListener extends ListenerAdapter { @Override public void onGenericEvent(@Nonnull GenericEvent event) {