From 56d8efb68e204fc8ec658722f2779a56470c376a Mon Sep 17 00:00:00 2001 From: Skidder <33130539+GregTCLTK@users.noreply.github.com> Date: Sun, 27 Oct 2019 11:58:29 +0100 Subject: [PATCH 01/14] Create config.json --- config.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config.json diff --git a/config.json b/config.json new file mode 100644 index 0000000..712ad55 --- /dev/null +++ b/config.json @@ -0,0 +1,3 @@ +{ + "Token": "INSERT TOKEN HERE" + } From cbfc8fbb26e51b9e0f1dc29af928bd070983c574 Mon Sep 17 00:00:00 2001 From: Skidder <33130539+GregTCLTK@users.noreply.github.com> Date: Sun, 27 Oct 2019 11:59:47 +0100 Subject: [PATCH 02/14] Delete config.json --- config.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 config.json diff --git a/config.json b/config.json deleted file mode 100644 index 712ad55..0000000 --- a/config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Token": "INSERT TOKEN HERE" - } From 359e28e99fbee84ebf37205ec2bdb35e2a0171f4 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 12:02:29 +0100 Subject: [PATCH 03/14] Auto stash before merge of "hax-dev" and "origin/master" --- src/main/java/com/bbn/hadder/Hadder.java | 9 +++------ src/main/java/com/bbn/hadder/commands/Command.java | 1 + .../java/com/bbn/hadder/commands/TestCommand.java | 5 +++++ .../bbn/hadder/commands/moderation/BanCommand.java | 5 +++++ .../bbn/hadder/commands/owner/ShutdownCommand.java | 11 ++++++++++- .../bbn/hadder/commands/settings/PrefixCommand.java | 5 +++++ .../java/com/bbn/hadder/core/CommandHandler.java | 12 +++++++----- 7 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index efc253e..5cf43e6 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -17,6 +17,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.List; public class Hadder { @@ -44,12 +45,8 @@ public class Hadder { builder.setActivity(Activity.streaming("auf dem BigBotNetwork", "https://twitch.tv/BigBotNetwork")); builder.setToken(config.getString("Token")); - CommandHandler.cmdlist.put("test", new TestCommand()); - CommandHandler.cmdlist.put("ban", new BanCommand()); - CommandHandler.cmdlist.put("prefix", new PrefixCommand()); - CommandHandler.cmdlist.put("stop", new ShutdownCommand()); - CommandHandler.cmdlist.put("shutdown", new ShutdownCommand()); - CommandHandler.cmdlist.put("kick", new KickCommand()); + + CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand())); builder.addEventListeners( new MentionListener(), diff --git a/src/main/java/com/bbn/hadder/commands/Command.java b/src/main/java/com/bbn/hadder/commands/Command.java index 95b1468..fcb46df 100644 --- a/src/main/java/com/bbn/hadder/commands/Command.java +++ b/src/main/java/com/bbn/hadder/commands/Command.java @@ -8,4 +8,5 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; public interface Command { void executed(String[] args, MessageReceivedEvent event); + String[] labels(); } diff --git a/src/main/java/com/bbn/hadder/commands/TestCommand.java b/src/main/java/com/bbn/hadder/commands/TestCommand.java index 4fd5742..d31867a 100644 --- a/src/main/java/com/bbn/hadder/commands/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/TestCommand.java @@ -11,4 +11,9 @@ public class TestCommand implements Command { public void executed(String[] args, MessageReceivedEvent event) { event.getTextChannel().sendMessage("TEST my friends").queue(); } + + @Override + public String[] labels() { + return new String[]{"test"}; + } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 6d1e8f6..c2cd496 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -48,4 +48,9 @@ public class BanCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); } } + + @Override + public String[] labels() { + return new String[]{"ban"}; + } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index aea13fc..f01a06f 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -16,11 +16,20 @@ public class ShutdownCommand implements Command { if (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")) { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Shutdown").build()).queue(); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } event.getJDA().shutdown(); - Rethink.disconnect(); } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); } } + + @Override + public String[] labels() { + return new String[]{"shutdown"}; + } } diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index d72a6c5..86bfbca 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -36,4 +36,9 @@ public class PrefixCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); } } + + @Override + public String[] labels() { + return new String[]{"prefix"}; + } } diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 902cc90..91c6e67 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -6,16 +6,18 @@ package com.bbn.hadder.core; import com.bbn.hadder.commands.Command; -import java.util.HashMap; +import java.util.ArrayList; public class CommandHandler { - public static HashMap cmdlist = new HashMap<>(); + public static ArrayList cmdlist = new ArrayList<>(); public static void handleCommand(CommandParser.commandContainer cmd) { - if(cmdlist.containsKey(cmd.invoke)) { - cmdlist.get(cmd.invoke).executed(cmd.args, cmd.event); - } + for (Command command : cmdlist) { + for (String label : command.labels()) { + if (label.equals(cmd.invoke)) command.executed(cmd.args, cmd.event); + } + } } } From c830cab0edb35b25079e2ee826595f4c4cc9000f Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 12:02:29 +0100 Subject: [PATCH 04/14] Updated Commands --- src/main/java/com/bbn/hadder/Hadder.java | 9 +++------ src/main/java/com/bbn/hadder/commands/Command.java | 1 + .../java/com/bbn/hadder/commands/TestCommand.java | 5 +++++ .../bbn/hadder/commands/moderation/BanCommand.java | 5 +++++ .../bbn/hadder/commands/owner/ShutdownCommand.java | 11 ++++++++++- .../bbn/hadder/commands/settings/PrefixCommand.java | 5 +++++ .../java/com/bbn/hadder/core/CommandHandler.java | 12 +++++++----- 7 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index efc253e..5cf43e6 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -17,6 +17,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.List; public class Hadder { @@ -44,12 +45,8 @@ public class Hadder { builder.setActivity(Activity.streaming("auf dem BigBotNetwork", "https://twitch.tv/BigBotNetwork")); builder.setToken(config.getString("Token")); - CommandHandler.cmdlist.put("test", new TestCommand()); - CommandHandler.cmdlist.put("ban", new BanCommand()); - CommandHandler.cmdlist.put("prefix", new PrefixCommand()); - CommandHandler.cmdlist.put("stop", new ShutdownCommand()); - CommandHandler.cmdlist.put("shutdown", new ShutdownCommand()); - CommandHandler.cmdlist.put("kick", new KickCommand()); + + CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand())); builder.addEventListeners( new MentionListener(), diff --git a/src/main/java/com/bbn/hadder/commands/Command.java b/src/main/java/com/bbn/hadder/commands/Command.java index 95b1468..fcb46df 100644 --- a/src/main/java/com/bbn/hadder/commands/Command.java +++ b/src/main/java/com/bbn/hadder/commands/Command.java @@ -8,4 +8,5 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; public interface Command { void executed(String[] args, MessageReceivedEvent event); + String[] labels(); } diff --git a/src/main/java/com/bbn/hadder/commands/TestCommand.java b/src/main/java/com/bbn/hadder/commands/TestCommand.java index 4fd5742..d31867a 100644 --- a/src/main/java/com/bbn/hadder/commands/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/TestCommand.java @@ -11,4 +11,9 @@ public class TestCommand implements Command { public void executed(String[] args, MessageReceivedEvent event) { event.getTextChannel().sendMessage("TEST my friends").queue(); } + + @Override + public String[] labels() { + return new String[]{"test"}; + } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 6d1e8f6..c2cd496 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -48,4 +48,9 @@ public class BanCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); } } + + @Override + public String[] labels() { + return new String[]{"ban"}; + } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index aea13fc..f01a06f 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -16,11 +16,20 @@ public class ShutdownCommand implements Command { if (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")) { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Shutdown").build()).queue(); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } event.getJDA().shutdown(); - Rethink.disconnect(); } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); } } + + @Override + public String[] labels() { + return new String[]{"shutdown"}; + } } diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index d72a6c5..86bfbca 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -36,4 +36,9 @@ public class PrefixCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); } } + + @Override + public String[] labels() { + return new String[]{"prefix"}; + } } diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 902cc90..91c6e67 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -6,16 +6,18 @@ package com.bbn.hadder.core; import com.bbn.hadder.commands.Command; -import java.util.HashMap; +import java.util.ArrayList; public class CommandHandler { - public static HashMap cmdlist = new HashMap<>(); + public static ArrayList cmdlist = new ArrayList<>(); public static void handleCommand(CommandParser.commandContainer cmd) { - if(cmdlist.containsKey(cmd.invoke)) { - cmdlist.get(cmd.invoke).executed(cmd.args, cmd.event); - } + for (Command command : cmdlist) { + for (String label : command.labels()) { + if (label.equals(cmd.invoke)) command.executed(cmd.args, cmd.event); + } + } } } From 43b2c95f78b36792f5a240b211ffe51540118310 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 12:05:10 +0100 Subject: [PATCH 05/14] Kick Command Fix --- .../java/com/bbn/hadder/commands/moderation/BanCommand.java | 1 - .../java/com/bbn/hadder/commands/moderation/KickCommand.java | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index c2cd496..cccdf83 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -42,7 +42,6 @@ public class BanCommand implements Command { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("We will be adding multiple banning within a command in the future.").build()).queue(); } - } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 886549d..949de38 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -44,4 +44,9 @@ public class KickCommand implements Command { } } } + + @Override + public String[] labels() { + return new String[0]; + } } From 2f0f2e4e815663dad4316a13366562b2c006fba3 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 12:06:21 +0100 Subject: [PATCH 06/14] Fixed Kick Command --- .../java/com/bbn/hadder/commands/moderation/KickCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 949de38..fa392f4 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -47,6 +47,6 @@ public class KickCommand implements Command { @Override public String[] labels() { - return new String[0]; + return new String[]{"kick"}; } } From 02a529cc32506efc60962a82f9d8bf2f5b1224c3 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 12:31:40 +0100 Subject: [PATCH 07/14] Shut the frick down --- .../commands/owner/ShutdownCommand.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index f01a06f..6c40c8c 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -4,11 +4,25 @@ package com.bbn.hadder.commands.owner; * @author Skidder / GregTCLTK */ +import com.bbn.hadder.Hadder; import com.bbn.hadder.Rethink; import com.bbn.hadder.commands.Command; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.OnlineStatus; +import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import org.json.JSONObject; + +import javax.annotation.Nonnull; +import javax.security.auth.login.LoginException; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; public class ShutdownCommand implements Command { @Override @@ -16,12 +30,9 @@ public class ShutdownCommand implements Command { if (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")) { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Shutdown").build()).queue(); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - event.getJDA().shutdown(); + event.getJDA().getShardManager().shutdown(); + System.out.println("Bot shut down via Command..."); + System.exit(0); } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); From e987bd1437c9b4e1484bb8f8cddcdcdf5d93cb1b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 14:51:48 +0100 Subject: [PATCH 08/14] 1000x cooler --- src/main/java/com/bbn/hadder/Hadder.java | 4 +- .../bbn/hadder/commands/fun/GifCommand.java | 62 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/fun/GifCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 5cf43e6..bde7d09 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -1,6 +1,8 @@ package com.bbn.hadder; import com.bbn.hadder.commands.TestCommand; +import com.bbn.hadder.commands.fun.GifCommand; +import com.bbn.hadder.commands.general.PingCommand; import com.bbn.hadder.commands.moderation.BanCommand; import com.bbn.hadder.commands.moderation.KickCommand; import com.bbn.hadder.commands.owner.ShutdownCommand; @@ -46,7 +48,7 @@ public class Hadder { builder.setToken(config.getString("Token")); - CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand())); + CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand(), new PingCommand(), new GifCommand())); builder.addEventListeners( new MentionListener(), diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java new file mode 100644 index 0000000..3597d21 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -0,0 +1,62 @@ +package com.bbn.hadder.commands.fun; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.json.JSONArray; +import org.json.JSONObject; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Random; + +public class GifCommand implements Command { + @Override + public void executed(String[] args, MessageReceivedEvent event) { + String url; + JSONArray array; + String query = ""; + for(String arg : args) { + query += arg.toLowerCase() + "+"; + query = query.substring(0, query.length()-1); + } + File configfile = new File("./config.json"); + if (!configfile.exists()) { + System.err.println("No Config File Found!"); + System.exit(1); + } + + JSONObject config = null; + try { + config = new JSONObject(new String(Files.readAllBytes(Paths.get(configfile.toURI())))); + } catch (IOException e) { + e.printStackTrace(); + } + OkHttpClient caller = new OkHttpClient(); + Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + config.getString("Giphy")).build(); + try { + Random rand = new Random(); + Response response = caller.newCall(request).execute(); + JSONObject json = new JSONObject(response.body().string()); + array = json.getJSONArray("data"); + int gifIndex = rand.nextInt(array.length()); + url = (String) array.getJSONObject(gifIndex).get("url"); + event.getTextChannel().sendMessage(url).queue(); + } catch (IOException | NullPointerException e) { + event.getTextChannel().sendMessage("Meddl Bruder. Ich hab heut leider kein gif für dich").queue(); + } + } + + @Override + public String[] labels() { + return new String[]{"gif"}; + } +} From f6b37b4e0ddd8d8cf782ca2617c6bc8119be163a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 14:51:58 +0100 Subject: [PATCH 09/14] 0x cooler weil 24/7 0er ping --- .../hadder/commands/general/PingCommand.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/commands/general/PingCommand.java diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java new file mode 100644 index 0000000..d155efc --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -0,0 +1,24 @@ +package com.bbn.hadder.commands.general; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; + +public class PingCommand implements Command { + + @Override + public void executed(String[] args, MessageReceivedEvent event) { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Ping").setDescription("0").build()).queue(); + } + + @Override + public String[] labels() { + return new String[]{"ping"}; + } +} From 24bbec51a6ed842d881388338e9c78b1a14a1952 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 14:55:06 +0100 Subject: [PATCH 10/14] :fish: --- src/main/java/com/bbn/hadder/commands/fun/GifCommand.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index 3597d21..e9ae1a6 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -28,11 +28,8 @@ public class GifCommand implements Command { query += arg.toLowerCase() + "+"; query = query.substring(0, query.length()-1); } + File configfile = new File("./config.json"); - if (!configfile.exists()) { - System.err.println("No Config File Found!"); - System.exit(1); - } JSONObject config = null; try { @@ -50,7 +47,7 @@ public class GifCommand implements Command { int gifIndex = rand.nextInt(array.length()); url = (String) array.getJSONObject(gifIndex).get("url"); event.getTextChannel().sendMessage(url).queue(); - } catch (IOException | NullPointerException e) { + } catch (Exception e) { event.getTextChannel().sendMessage("Meddl Bruder. Ich hab heut leider kein gif für dich").queue(); } } From 8daa901eebaaaa5ff47ea2f7431d4d547c333bbe Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 15:03:34 +0100 Subject: [PATCH 11/14] =?UTF-8?q?Fahr=20mit=20dem=20Cityroller=20vor=20bei?= =?UTF-8?q?=20deiner=20schei=C3=9F=20party?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bbn/hadder/commands/general/PingCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java index d155efc..516ba98 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -14,7 +14,9 @@ public class PingCommand implements Command { @Override public void executed(String[] args, MessageReceivedEvent event) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Ping").setDescription("0").build()).queue(); + event.getJDA().getRestPing().queue(ping -> { + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Ping").setDescription(String.valueOf(ping)).build()).queue(); + }); } @Override From 28c5c005f0e578f9d5d4ae2981e7007a053fd6b5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 15:07:24 +0100 Subject: [PATCH 12/14] Du sitzt im Mercedes und siehst aus wie ein Loser --- .../java/com/bbn/hadder/commands/moderation/KickCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 949de38..0fe8521 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -18,7 +18,7 @@ public class KickCommand implements Command { if (event.getMessage().getMentionedMembers().size() == 1) { Member victim = event.getMessage().getMentionedMembers().get(0); if (!event.getAuthor().getId().equals(victim.getId())) { - if (event.getJDA().getSelfUser().getId().equals(victim.getId())) { + if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) { if (event.getGuild().getSelfMember().canInteract(victim)) { event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); From 2d07b72db176844f407eb7fc9f589a6728fe42cb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 15:11:15 +0100 Subject: [PATCH 13/14] =?UTF-8?q?Mann,=20ich=20sitze=20in=20der=20Bahn=20u?= =?UTF-8?q?nd=20f=C3=BChl'=20mich=20tausendmal=20cooler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bbn/hadder/commands/moderation/KickCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 0fe8521..843899b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -47,6 +47,6 @@ public class KickCommand implements Command { @Override public String[] labels() { - return new String[0]; + return new String[]{"kick"}; } } From b847f8371779fd6f158ba949ee6bd03c1573fa5c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 15:13:46 +0100 Subject: [PATCH 14/14] Update Gif Command --- src/main/java/com/bbn/hadder/commands/fun/GifCommand.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index e9ae1a6..d393613 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -5,6 +5,8 @@ package com.bbn.hadder.commands.fun; */ import com.bbn.hadder.commands.Command; +import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -48,7 +50,8 @@ public class GifCommand implements Command { url = (String) array.getJSONObject(gifIndex).get("url"); event.getTextChannel().sendMessage(url).queue(); } catch (Exception e) { - event.getTextChannel().sendMessage("Meddl Bruder. Ich hab heut leider kein gif für dich").queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, builder).setTitle("Error").setDescription("Please try again with another term.").build()).queue(); } }