From 2d07b72db176844f407eb7fc9f589a6728fe42cb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 15:11:15 +0100 Subject: [PATCH 1/7] =?UTF-8?q?Mann,=20ich=20sitze=20in=20der=20Bahn=20und?= =?UTF-8?q?=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"}; } } -- 2.45.3 From b847f8371779fd6f158ba949ee6bd03c1573fa5c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 15:13:46 +0100 Subject: [PATCH 2/7] 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(); } } -- 2.45.3 From bddbd95791a3e9ee66c809e2c2f428f37578a88b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 15:36:25 +0100 Subject: [PATCH 3/7] Pom Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 365a5b9..7371623 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Hadder Hadder - 1.0-SNAPSHOT + 0.2-ALPHA Hadder -- 2.45.3 From 738decf1c273c6f9fe027e6b504dfa9a0977cf51 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 16:25:46 +0100 Subject: [PATCH 4/7] Ey, du flext mit deinem Money und siehst aus wie ein Loser --- .../bbn/hadder/commands/fun/GifCommand.java | 58 ++++++++++--------- .../commands/owner/ShutdownCommand.java | 16 +---- 2 files changed, 33 insertions(+), 41 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 d393613..caf1b42 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -21,37 +21,43 @@ 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); - } + if (args.length > 0) { + String url; + JSONArray array; + StringBuilder query = new StringBuilder(); + for (String arg : args) { + query.append(arg.toLowerCase()).append("+"); + query = new StringBuilder(query.substring(0, query.length() - 1)); + } - File configfile = new File("./config.json"); + File configfile = new File("./config.json"); - 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 (Exception e) { + 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 (Exception e) { + 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(); + } + } else { 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(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to write at least one search term!").build()).queue(); } } 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 6c40c8c..926ad15 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -4,25 +4,11 @@ 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; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; public class ShutdownCommand implements Command { @Override -- 2.45.3 From e96354eed8879f07256c21d21a6feee35753e3f1 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 18:23:13 +0100 Subject: [PATCH 5/7] eyyy --- .../bbn/hadder/listener/GuildJoinListener.java | 16 ---------------- .../bbn/hadder/listener/GuildLeaveListener.java | 16 ---------------- .../{BotListListener.java => GuildListener.java} | 0 3 files changed, 32 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/listener/GuildJoinListener.java delete mode 100644 src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java rename src/main/java/com/bbn/hadder/listener/{BotListListener.java => GuildListener.java} (100%) diff --git a/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java b/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java deleted file mode 100644 index cdea693..0000000 --- a/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.bbn.hadder.listener; - -/* - * @author Skidder / GregTCLTK - */ - -import com.bbn.hadder.Rethink; -import net.dv8tion.jda.api.events.guild.GuildJoinEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.jetbrains.annotations.NotNull; - -public class GuildJoinListener extends ListenerAdapter { - public void onGuildJoin(@NotNull GuildJoinEvent event) { - Rethink.insertServer(event.getGuild().getId()); - } -} diff --git a/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java b/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java deleted file mode 100644 index fc65d2e..0000000 --- a/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.bbn.hadder.listener; - -/* - * @author Skidder / GregTCLTK - */ - -import net.dv8tion.jda.api.events.guild.GuildLeaveEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.jetbrains.annotations.NotNull; - -public class GuildLeaveListener extends ListenerAdapter { - public void onGuildLeave(@NotNull GuildLeaveEvent event) { - - - } -} diff --git a/src/main/java/com/bbn/hadder/listener/BotListListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java similarity index 100% rename from src/main/java/com/bbn/hadder/listener/BotListListener.java rename to src/main/java/com/bbn/hadder/listener/GuildListener.java -- 2.45.3 From 93937bc9535649ce7692a84ccbcd28fc50c4ee54 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 18:34:30 +0100 Subject: [PATCH 6/7] Jojojo ey --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 12 ++++++++++++ .../java/com/bbn/hadder/listener/GuildListener.java | 13 +++++++++---- .../java/com/bbn/hadder/listener/ReadyListener.java | 6 ++++++ 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index bde7d09..fad99a7 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -56,7 +56,7 @@ public class Hadder { new CommandListener(), new GuildJoinListener(), new GuildLeaveListener(), - new BotListListener(), + new GuildListener(), new ReadyListener()); try { diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 7853082..68fa912 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -72,6 +72,18 @@ public class Rethink { return out; } + public static String insertUser(String id) { + String out = ""; + try { + Cursor cursor = r.table("user") + .insert(r.hashMap("id", id) + .with("prefix", "h.") + ).run(conn); + out = cursor.next().toString(); + } catch (ClassCastException ignored) {} + return out; + } + public static void setup() { try { r.dbCreate("Hadder").run(conn); diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 2d57cbc..7da1d4f 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -4,20 +4,25 @@ package com.bbn.hadder.listener; * @author Skidder / GregTCLTK */ +import com.bbn.hadder.Rethink; import net.dv8tion.jda.api.events.guild.GuildJoinEvent; import net.dv8tion.jda.api.events.guild.GuildLeaveEvent; +import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -public class BotListListener extends ListenerAdapter { +public class GuildListener extends ListenerAdapter { public void onGuildJoin(GuildJoinEvent event) { - - + Rethink.insertServer(event.getGuild().getId()); } public void onGuildLeave(GuildLeaveEvent event) { + } - + public void onGuildMemberJoin(GuildMemberJoinEvent event) { + if (!event.getUser().getId().equals(event.getJDA().getSelfUser().getId())) { + Rethink.insertUser(event.getUser().getId()); + } } } diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 3072f77..4d24a2b 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -2,6 +2,7 @@ package com.bbn.hadder.listener; import com.bbn.hadder.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.hooks.ListenerAdapter; @@ -12,6 +13,11 @@ public class ReadyListener extends ListenerAdapter { @Override public void onReady(@Nonnull ReadyEvent event) { Rethink.setup(); + for (User user : event.getJDA().getUsers()) { + if (!user.getId().equals(event.getJDA().getSelfUser().getId())) { + Rethink.insertUser(user.getId()); + } + } for (Guild g : event.getJDA().getGuilds()) { Rethink.insertServer(g.getId()); } -- 2.45.3 From 7ea6c4d9b4ba3c4ff0f367fff5ba4e08a404df4b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 22:05:25 +0100 Subject: [PATCH 7/7] Update Hadder.java --- src/main/java/com/bbn/hadder/Hadder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index bde7d09..157d555 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -38,8 +38,7 @@ public class Hadder { e.printStackTrace(); } - Rethink.connect(); - + Rethink.connect(); DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder(); -- 2.45.3