From 258be0f57beba840d3cf3be5daa6d3e6ca5702e0de42350fbca587798bf4646f Mon Sep 17 00:00:00 2001 From: Gregor Bigalke Date: Tue, 7 Aug 2018 20:30:39 +0200 Subject: [PATCH] wow --- .../data/mining/Listener/eventListener.java | 33 -------------- .../data/mining/Listener/managerListener.java | 32 -------------- .../discord/data/mining/Listener/onready.java | 44 ------------------- src/main/java/discord/data/mining/Main.java | 9 ++-- 4 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 src/main/java/discord/data/mining/Listener/eventListener.java delete mode 100644 src/main/java/discord/data/mining/Listener/managerListener.java delete mode 100644 src/main/java/discord/data/mining/Listener/onready.java diff --git a/src/main/java/discord/data/mining/Listener/eventListener.java b/src/main/java/discord/data/mining/Listener/eventListener.java deleted file mode 100644 index 11029fd..0000000 --- a/src/main/java/discord/data/mining/Listener/eventListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package discord.data.mining.Listener; - -import discord.data.mining.Main; -import discord.data.mining.sendMessage; -import net.dv8tion.jda.core.AccountType; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.JDABuilder; -import net.dv8tion.jda.core.events.Event; -import net.dv8tion.jda.core.events.ReadyEvent; -import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.hooks.ListenerAdapter; - -import java.awt.*; - - -/** - * @author GregTCLTK - * @time 21:22 29.06.2018 - * @project Cryptix-Data-Mining - * @package discord.data.mining.Listener - * @class onReactionAdd - **/ - - -public class eventListener extends ListenerAdapter { - - @Override - public void onGenericEvent(Event event) { - Main.Messageperh++; - sendMessage.sendMessage(event); - } -} diff --git a/src/main/java/discord/data/mining/Listener/managerListener.java b/src/main/java/discord/data/mining/Listener/managerListener.java deleted file mode 100644 index 17fa33a..0000000 --- a/src/main/java/discord/data/mining/Listener/managerListener.java +++ /dev/null @@ -1,32 +0,0 @@ -package discord.data.mining.Listener; - -import discord.data.mining.Main; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.hooks.ListenerAdapter; - -/** - * @author GregTCLTK - * @time 09:42 01.07.2018 - * @project Cryptix-Data-Mining - * @package discord.data.mining.Listener - * @class managerListener - **/ - -public class managerListener extends ListenerAdapter { - - @Override - public void onMessageReceived(MessageReceivedEvent event) { - if (event.getAuthor().getId().contains("401817301919465482") || event.getAuthor().getId().contains("261083609148948488")) { - if (event.getMessage().getContentRaw().equals("dm!shutdown")) { - - for (JDA Bots : Main.bots) { - Bots.shutdown(); - } - for (JDA Clients : Main.clients) { - Clients.shutdown(); - } - } - } - } -} diff --git a/src/main/java/discord/data/mining/Listener/onready.java b/src/main/java/discord/data/mining/Listener/onready.java deleted file mode 100644 index e73bbcd..0000000 --- a/src/main/java/discord/data/mining/Listener/onready.java +++ /dev/null @@ -1,44 +0,0 @@ -package discord.data.mining.Listener; - -import discord.data.mining.Logger; -import discord.data.mining.Main; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Invite; -import net.dv8tion.jda.core.events.ReadyEvent; -import net.dv8tion.jda.core.hooks.ListenerAdapter; - -/** - * @author Hax - * @time 12:04 30.06.2018 - * @project Cryptix-Data-Mining - * @package discord.data.mining.Listener - * @class onready - **/ - -public class onready extends ListenerAdapter { - - @Override - public void onReady(ReadyEvent event) { - Logger.info("Client " + event.getJDA().getSelfUser().getName() + "#" +event.getJDA().getSelfUser().getDiscriminator() + "\nGuilds: " + event.getJDA().getGuilds().size() + "\nUser: " + event.getJDA().getUsers().size()); - Main.onlineclients.add(event.getJDA().getSelfUser().getName()); - Logger.info("Arraylist size " + Main.onlineclients.size() + " " + Main.clients.size()); - for (Guild guild : event.getJDA().getGuilds()) { - if (!guild.getId().equals("448554629282922527")) { - if (!Main.guilds.contains(guild)) { - Main.guilds.add(guild); - } else { - Logger.info("Leave " + guild.getName()); - guild.leave().queue(); - } - } - } - if (Main.onlineclients.size() == Main.clients.size()) { - Logger.info("All clients loaded"); - for (JDA jda : Main.clients) { - jda.addEventListener(new eventListener()); - } - } - } - -} diff --git a/src/main/java/discord/data/mining/Main.java b/src/main/java/discord/data/mining/Main.java index 9b6b1d1..e170931 100644 --- a/src/main/java/discord/data/mining/Main.java +++ b/src/main/java/discord/data/mining/Main.java @@ -1,8 +1,7 @@ package discord.data.mining; -import discord.data.mining.Listener.eventListener; -import discord.data.mining.Listener.managerListener; -import discord.data.mining.Listener.onready; +import discord.data.mining.Listener.MessageReceivedListener; +import discord.data.mining.Listener.ReadyListener; import net.dv8tion.jda.core.AccountType; import net.dv8tion.jda.core.JDA; import net.dv8tion.jda.core.JDABuilder; @@ -31,14 +30,14 @@ public class Main { try { Database.connect(); for (String Token : managerTokens) { - manager.add(new JDABuilder(AccountType.BOT).setAutoReconnect(true).setToken(Token).addEventListener(new managerListener()).buildAsync()); + manager.add(new JDABuilder(AccountType.BOT).setAutoReconnect(true).setToken(Token).addEventListener(new MessageReceivedListener()).buildAsync()); } Thread.sleep(1500); onlinethread.main(); for (String Token : clienttokens) { - clients.add(new JDABuilder(AccountType.CLIENT).setToken(Token).addEventListener(new onready()).setAutoReconnect(true).buildAsync()); + clients.add(new JDABuilder(AccountType.CLIENT).setToken(Token).addEventListener(new ReadyListener()).setAutoReconnect(true).buildAsync()); } for (String Token : botTokens) { bots.add(new JDABuilder(AccountType.BOT).setAutoReconnect(true).setToken(Token).buildAsync());