From 8d0aabb09c22d9bd11c0af319ea1e3a1cacbaa80 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 10 Nov 2019 13:11:29 +0100 Subject: [PATCH 01/41] Few changes --- .../java/com/bbn/hadder/commands/misc/GitHubCommand.java | 8 ++------ .../com/bbn/hadder/commands/misc/ScreenshareCommand.java | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index a75f0d4..3240549 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -33,14 +33,10 @@ public class GitHubCommand implements Command { String website = "None"; try { bio = json.getString("bio"); - } catch (JSONException e) { - - } + } catch (JSONException ignored) {} try { location = json.getString("location"); - } catch (JSONException e) { - - } + } catch (JSONException ignored) {} if(!json.getString("blog").equals("")) website = json.getString("blog"); diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java index 7c5f810..80ed92e 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java @@ -33,7 +33,7 @@ public class ScreenshareCommand implements Command { List vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true); if (vcs.size() > 1) { EmbedBuilder eb = new EmbedBuilder() - .setTitle("Please Choose a Voicechannel") + .setTitle("Please Choose a Voice Channel") .setDescription("There is more than one channel with this name"); for (int i = 0; i < vcs.size(); i++) { VoiceChannel voiceChannel = vcs.get(i); @@ -54,14 +54,14 @@ public class ScreenshareCommand implements Command { } } catch (NumberFormatException e) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() - .setTitle("Wait, thats illegal") + .setTitle("Wait, that's illegal") .setDescription("This isn't a Number.")).build()).queue(); } }, event.getJDA(), event.getAuthor()); } else if (vcs.size()==0) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() .setTitle("Hol' up") - .setDescription("There is no Voicechannel named like this. \n\nNote: Make sure the Voicechannel is on this Guild.")).build()).queue(); + .setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.")).build()).queue(); } else { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, new EmbedBuilder() .setTitle("Here's your Url to share your Screen") From 352a772fe54373105e9a63768d6ce82d27ab1d15 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 10 Nov 2019 13:16:03 +0100 Subject: [PATCH 02/41] Hello my friends --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 8 +++----- src/main/java/com/bbn/hadder/core/CommandHandler.java | 5 ++--- src/main/java/com/bbn/hadder/core/Config.java | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 5cf0dfc..c515960 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -23,7 +23,7 @@ public class Hadder { startBot(); } - public static void startBot() { + private static void startBot() { Config config = new Config("./config.json"); if (!config.fileExists()) config.create(); config.load(); diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 7aed33c..959892c 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -18,11 +18,11 @@ public class Rethink { private Connection conn; private Config config; - public Rethink(Config config) { + Rethink(Config config) { this.config = config; } - public boolean connect() { + public void connect() { try { conn = r.connection() .hostname(config.getDatabaseIP()) @@ -35,7 +35,6 @@ public class Rethink { System.out.println(e.toString()); System.out.println("DB CONNECTION FAILED"); } - return true; } public void disconnect() { @@ -46,8 +45,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); - JSONArray jsonArray = new JSONArray(string); - return jsonArray; + return new JSONArray(string); } catch (NoSuchElementException e) { return null; } catch (Exception e) { diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index cb7f7dd..71c3a49 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -9,8 +9,8 @@ import java.util.List; public class CommandHandler { - List commandList; - Config config; + private List commandList; + private Config config; public CommandHandler(List commandList, Config config) { this.commandList = commandList; @@ -18,7 +18,6 @@ public class CommandHandler { } public void handle(MessageReceivedEvent event, Rethink rethink, String prefix) { - StringBuilder regexBuilder = new StringBuilder().append("\\").append(prefix); String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0]; for (Command cmd : commandList) { for (String label : cmd.labels()) { diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 7b9ea31..70f030a 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -33,7 +33,7 @@ public class Config { public void create() { try { if (Files.notExists(file)) { - file = Files.createFile(file); + Files.createFile(file); } Files.write(file, defaultConfigContent().getBytes()); } catch (IOException e) { From 101a31f3388436f89fdd0966b4742574045bafbd Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 10 Nov 2019 20:48:18 +0100 Subject: [PATCH 03/41] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd779c4..4f62557 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # Hadder [![Build Status](https://travis-ci.com/BigBotNetwork/Hadder.svg?branch=master)](https://travis-ci.com/BigBotNetwork/Hadder) + From 5e67ef48db8a51d57b82bc3dbfcde460eff600fd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 13:22:38 +0000 Subject: [PATCH 04/41] Bump JDA from 4.0.0_56 to 4.0.0_59 Bumps JDA from 4.0.0_56 to 4.0.0_59. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23bcffe..688c7c3 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_56 + 4.0.0_59 org.json From 0b67064e34c36db1bb874e2535be806743abeb61 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 13:44:49 +0000 Subject: [PATCH 05/41] Bump JDA from 4.0.0_59 to 4.0.0_60 Bumps JDA from 4.0.0_59 to 4.0.0_60. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 688c7c3..d602e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_59 + 4.0.0_60 org.json From f7e85bfaf7f50ff4657306834d085f06bb232718 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 14 Nov 2019 19:08:30 +0100 Subject: [PATCH 06/41] Hype Hype Hype Hype --- .../hadder/commands/misc/GitHubCommand.java | 78 ++++++++++--------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 3240549..5bafb91 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -21,48 +21,54 @@ public class GitHubCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { - Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build(); - try { - - Response response = new OkHttpClient().newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - - String nickname = json.getString("name"); - String bio = "None"; - String location = "Unknown"; - String website = "None"; + if (args[0].equals("link")) { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Link your GitHub Account").setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue(); + } else { + Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build(); try { - bio = json.getString("bio"); - } catch (JSONException ignored) {} - try { - location = json.getString("location"); - } catch (JSONException ignored) {} - if(!json.getString("blog").equals("")) website = json.getString("blog"); + Response response = new OkHttpClient().newCall(request).execute(); + JSONObject json = new JSONObject(response.body().string()); - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder) - .setAuthor("Information about " + nickname + " (" + args[0] + ")", "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") - .setThumbnail(json.getString("avatar_url")) - .addField("User bio", bio, false) - .addField("Location", location, true) - .addField("Website", website, true) - .addField("Public repositories", String.valueOf(json.getInt("public_repos")), true) - .addField("Public gists", String.valueOf(json.getInt("public_gists")), true) - .addField("Followers", String.valueOf(json.getInt("followers")), true) - .addField("Following", String.valueOf(json.getInt("following")), true) - .build()).queue(); + String nickname = json.getString("name"); + String bio = "None"; + String location = "Unknown"; + String website = "None"; + try { + bio = json.getString("bio"); + } catch (JSONException ignored) { + } + try { + location = json.getString("location"); + } catch (JSONException ignored) { + } - } catch (IOException | NullPointerException e) { - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, builder).setDescription("The GitHub API might be down at the moment!").build()).queue(); - } catch (JSONException e) { - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("This user does not exist!").build()).queue(); + if (!json.getString("blog").equals("")) website = json.getString("blog"); + + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder) + .setAuthor("Information about " + nickname + " (" + args[0] + ")", "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") + .setThumbnail(json.getString("avatar_url")) + .addField("User bio", bio, false) + .addField("Location", location, true) + .addField("Website", website, true) + .addField("Public repositories", String.valueOf(json.getInt("public_repos")), true) + .addField("Public gists", String.valueOf(json.getInt("public_gists")), true) + .addField("Followers", String.valueOf(json.getInt("followers")), true) + .addField("Following", String.valueOf(json.getInt("following")), true) + .build()).queue(); + + } catch (IOException | NullPointerException e) { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, builder).setDescription("The GitHub API might be down at the moment!").build()).queue(); + } catch (JSONException e) { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("This user does not exist!").build()).queue(); + } } } else { - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to specify a user!").build()).queue(); + event.getTextChannel().sendMessage("SOON").queue(); } } From 5183cac5cc9761b4153092c7b502a68231344372 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 13:41:50 +0000 Subject: [PATCH 07/41] Bump JDA from 4.0.0_60 to 4.0.0_61 Bumps JDA from 4.0.0_60 to 4.0.0_61. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d602e9c..3211132 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_60 + 4.0.0_61 org.json From 5be7bd2f8e6894d38eaaa83d385a0b8696b1d2ba Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 15 Nov 2019 15:19:34 +0100 Subject: [PATCH 08/41] New Invite Command --- src/main/java/com/bbn/hadder/Hadder.java | 1 + .../hadder/commands/misc/InviteCommand.java | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index c515960..2bcb044 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -53,6 +53,7 @@ public class Hadder { new ScreenshareCommand(), new RebootCommand(), new EqualsCommand(), + new InviteCommand(), new GuildPrefixCommand()), config); builder.addEventListeners( diff --git a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java new file mode 100644 index 0000000..bcfa6ad --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java @@ -0,0 +1,34 @@ +package com.bbn.hadder.commands.misc; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; + +public class InviteCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](discordapp.com/oauth2/authorize?client_id=637002314162372639&scope=bot&permissions=470133879)").build()).queue(); + } + + @Override + public String[] labels() { + return new String[]{"invite"}; + } + + @Override + public String description() { + return "Hadder Bot Invite"; + } + + @Override + public String usage() { + return ""; + } +} From e3a943fdb0f8a436ad875ebfb20c599f0e082ca8 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 15 Nov 2019 15:48:52 +0100 Subject: [PATCH 09/41] Introducing the Nick Command --- src/main/java/com/bbn/hadder/Hadder.java | 1 + .../commands/moderation/NickCommand.java | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 2bcb044..8a0e59a 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -54,6 +54,7 @@ public class Hadder { new RebootCommand(), new EqualsCommand(), new InviteCommand(), + new NickCommand(), new GuildPrefixCommand()), config); builder.addEventListeners( diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java new file mode 100644 index 0000000..6e306a7 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -0,0 +1,44 @@ +package com.bbn.hadder.commands.moderation; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; + +public class NickCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + if (event.getMember().hasPermission(Permission.NICKNAME_MANAGE)) { + if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) { + + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + } + } 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[]{"nick"}; + } + + @Override + public String description() { + return "Rename a user"; + } + + @Override + public String usage() { + return "<@user> "; + } +} From 6a5b4028dc0a39baa18531bf0e5cea9b4196fa5c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 15 Nov 2019 15:57:35 +0100 Subject: [PATCH 10/41] InviteCommand yk --- src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java index bcfa6ad..ac79e18 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java @@ -4,6 +4,7 @@ package com.bbn.hadder.commands.misc; * @author Skidder / GregTCLTK */ +import com.bbn.hadder.Hadder; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; @@ -14,7 +15,7 @@ public class InviteCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](discordapp.com/oauth2/authorize?client_id=637002314162372639&scope=bot&permissions=470133879)").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)").build()).queue(); } @Override From 1e5008f790a3b9796dac62978e95cf30fea158c3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 15 Nov 2019 16:49:11 +0100 Subject: [PATCH 11/41] Mass Kick!!! --- .../commands/moderation/KickCommand.java | 32 +++++++++++++++---- .../commands/moderation/NickCommand.java | 2 ++ .../hadder/commands/owner/RebootCommand.java | 3 +- 3 files changed, 30 insertions(+), 7 deletions(-) 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 74ca429..d416f52 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -11,6 +11,7 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; + public class KickCommand implements Command { @Override @@ -30,18 +31,37 @@ public class KickCommand implements Command { } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not kick myself").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not kick myself!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You can't kick yourself.").build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention a user!").build()).queue(); - } else { - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("We will be adding multiple kicking within a command in the future.").build()).queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention a user!").build()).queue(); + } else if (event.getMessage().getMentionedMembers().size() > 1) { + for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { + Member member = event.getMessage().getMentionedMembers().get(i); + if (!event.getAuthor().getId().equals(member.getId())) { + if (!event.getJDA().getSelfUser().getId().equals(member.getId())) { + if (event.getGuild().getSelfMember().canInteract(member)) { + event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue(); + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not kick myself!").build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You can't kick yourself.").build()).queue(); + } + } + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Title xD").setDescription("Yo it worked xD").build()).queue(); } } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 6e306a7..3d1e6bb 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -16,7 +16,9 @@ public class NickCommand implements Command { public void executed(String[] args, CommandEvent event) { if (event.getMember().hasPermission(Permission.NICKNAME_MANAGE)) { if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) { + if (args.length < 1) { + } } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index 0923ba1..b058ffa 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -12,10 +12,11 @@ import net.dv8tion.jda.api.EmbedBuilder; public class RebootCommand implements Command { + @Override public void executed(String[] args, CommandEvent event) { if (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")) { - + } else { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); From 8782f5d8ca552b68f21483e4e9cae2b556dadd6e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 15 Nov 2019 16:57:09 +0100 Subject: [PATCH 12/41] Success Message --- .../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 d416f52..5d8cba1 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -61,7 +61,7 @@ public class KickCommand implements Command { } } EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Title xD").setDescription("Yo it worked xD").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully kicked ✅").setDescription("I successfully kicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } } From 2fe24a614e890cc8b610ae5a1b6707aac0820991 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 15 Nov 2019 17:30:13 +0100 Subject: [PATCH 13/41] Mass Ban Command Hey my friends --- .../commands/moderation/BanCommand.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) 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 5d61ed8..58a61ca 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -39,9 +39,28 @@ public class BanCommand implements Command { } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention a user!").build()).queue(); - } else { + } else if (event.getMessage().getMentionedMembers().size() > 1) { + for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { + Member member = event.getMessage().getMentionedMembers().get(i); + if (!event.getAuthor().getId().equals(member.getId())) { + if (!event.getJDA().getSelfUser().getId().equals(member.getId())) { + if (event.getGuild().getSelfMember().canInteract(member)) { + event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue(); + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not ban myself!").build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You can't ban yourself.").build()).queue(); + } + } 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(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully banned ✅").setDescription("I successfully banned " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); From c6354da1a685c5204c38efb686d4d8a452b261bd Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 11:26:08 +0100 Subject: [PATCH 14/41] Nick Command :smirk: Mass Nicks soon! --- .../commands/moderation/BanCommand.java | 2 +- .../commands/moderation/KickCommand.java | 2 +- .../commands/moderation/NickCommand.java | 29 +++++++++++++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) 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 58a61ca..19d7b94 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -38,7 +38,7 @@ public class BanCommand implements Command { } } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention a user!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); } else if (event.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); 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 5d8cba1..07f538c 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -39,7 +39,7 @@ public class KickCommand implements Command { } } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention a user!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); } else if (event.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 3d1e6bb..751c5bc 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -14,10 +14,33 @@ public class NickCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (event.getMember().hasPermission(Permission.NICKNAME_MANAGE)) { + if (event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getGuild().getOwnerId().equals(event.getMember().getId())) { if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) { - if (args.length < 1) { - + if (event.getMessage().getMentionedMembers().size() == 1) { + if (event.getGuild().getSelfMember().canInteract(event.getMessage().getMentionedMembers().get(0))) { + if (args.length > 1) { + if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { + event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getServerPrefix(event.getGuild().getId()))) { + event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getServerPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setTitle("Missing arguments").setDescription("You have to specify a new nickname for the user(s).").build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + } + } else if (event.getMessage().getMentionedMembers().size() == 0) { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); + } else { + event.getTextChannel().sendMessage("Mass Nicks == soon").queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); From 5542fa51a7c667ab0347014c7362326deda1f95b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 15:24:03 +0100 Subject: [PATCH 15/41] Mass Nick my friends :D --- .../commands/moderation/NickCommand.java | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 751c5bc..197be66 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -9,6 +9,7 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; public class NickCommand implements Command { @@ -17,30 +18,51 @@ public class NickCommand implements Command { if (event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getGuild().getOwnerId().equals(event.getMember().getId())) { if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) { if (event.getMessage().getMentionedMembers().size() == 1) { - if (event.getGuild().getSelfMember().canInteract(event.getMessage().getMentionedMembers().get(0))) { - if (args.length > 1) { - if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + if (!event.getMessage().getMentionedMembers().get(0).getId().equals(event.getGuild().getSelfMember().getId())) { + if (event.getGuild().getSelfMember().canInteract(event.getMessage().getMentionedMembers().get(0))) { + if (args.length > 1) { + if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { + event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getServerPrefix(event.getGuild().getId()))) { + event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getServerPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + } + } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getServerPrefix(event.getGuild().getId()))) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getServerPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setTitle("Missing arguments").setDescription("You have to specify a new nickname for the user(s).").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setTitle("Missing arguments").setDescription("You have to specify a new nickname for the user(s).").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); } } else { - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { + event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); + } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getServerPrefix(event.getGuild().getId()))) { + event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getServerPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); + } } } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); } else { - event.getTextChannel().sendMessage("Mass Nicks == soon").queue(); + for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { + Member member = event.getMessage().getMentionedMembers().get(i); + if (!event.getJDA().getSelfUser().getId().equals(member.getId())) { + event.getGuild().modifyNickname(member, args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue(); + } else { + event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue(); + } + } + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); From 983ea31debd677696840fd75997870be0a77124c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 15:48:18 +0100 Subject: [PATCH 16/41] RENAME! --- src/main/java/com/bbn/hadder/Rethink.java | 6 +++--- .../hadder/commands/moderation/GuildPrefixCommand.java | 2 +- .../com/bbn/hadder/commands/moderation/NickCommand.java | 8 ++++---- .../java/com/bbn/hadder/listener/CommandListener.java | 2 +- src/main/java/com/bbn/hadder/listener/GuildListener.java | 2 +- .../java/com/bbn/hadder/listener/MentionListener.java | 2 +- src/main/java/com/bbn/hadder/listener/ReadyListener.java | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 959892c..ba6a03e 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -103,15 +103,15 @@ public class Rethink { return this.get("user", "id", id, "prefix"); } - public String setServerPrefix(String prefix, String guildid) { + public String setGuildPrefix(String prefix, String guildid) { return this.update("server", guildid, "prefix", prefix); } - public String getServerPrefix(String id) { + public String getGuildPrefix(String id) { return this.get("server", "id", id, "prefix"); } - public String insertServer(String id) { + public String insertGuild(String id) { return this.insert("server", r.hashMap("id", id).with("prefix", "h.")); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java index 81f357a..2c41a40 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java @@ -14,7 +14,7 @@ public class GuildPrefixCommand implements Command { if (args.length == 1) { if (!args[0].contains("\"")) { - event.getRethink().setServerPrefix(args[0], event.getGuild().getId()); + event.getRethink().setGuildPrefix(args[0], event.getGuild().getId()); EmbedBuilder builder = new EmbedBuilder(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 197be66..1a7319b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -25,8 +25,8 @@ public class NickCommand implements Command { event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getServerPrefix(event.getGuild().getId()))) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getServerPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { + event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); } @@ -43,8 +43,8 @@ public class NickCommand implements Command { event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getServerPrefix(event.getGuild().getId()))) { - event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getServerPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { + event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index e09f7ea..b0d4bc9 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -24,7 +24,7 @@ public class CommandListener extends ListenerAdapter { public void onMessageReceived(MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT)) { if (!event.getAuthor().isBot()) { - String[] prefixes = {rethink.getUserPrefix(event.getAuthor().getId()), rethink.getServerPrefix(event.getGuild().getId()), event.getGuild().getSelfMember().getAsMention()+" ", event.getGuild().getSelfMember().getAsMention()}; + String[] prefixes = {rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()), event.getGuild().getSelfMember().getAsMention()+" ", event.getGuild().getSelfMember().getAsMention()}; for (String prefix : prefixes) { if (event.getMessage().getContentRaw().startsWith(prefix)) { handler.handle(event, rethink, prefix); diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 789e8b7..bd506f2 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -34,7 +34,7 @@ public class GuildListener extends ListenerAdapter { } } - rethink.insertServer(event.getGuild().getId()); + rethink.insertGuild(event.getGuild().getId()); EmbedBuilder builder = new EmbedBuilder(); event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder) .setTitle("Joined Server") diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 45638e1..cc7b3dc 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -27,7 +27,7 @@ public class MentionListener extends ListenerAdapter { .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false) .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false) .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false) - .addField("Prefix (Guild)", rethink.getServerPrefix(event.getGuild().getId()), false); + .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false); event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index e238ca1..678497c 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -29,7 +29,7 @@ public class ReadyListener extends ListenerAdapter { } } for (Guild g : event.getJDA().getGuilds()) { - rethink.insertServer(g.getId()); + rethink.insertGuild(g.getId()); } new BotList(config).post(); From 9e09944fff6c2e61334821328b641648f4e85082 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 16:30:13 +0100 Subject: [PATCH 17/41] Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3211132..7afe0e1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Hadder Hadder - 0.7-ALPHA + 0.7.1-ALPHA Hadder From 0b644af5ac405d25f7b626a4fe75de821741bb34 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 17:00:35 +0100 Subject: [PATCH 18/41] Better Code --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/commands/fun/GifCommand.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 8a0e59a..27df501 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -47,7 +47,7 @@ public class Hadder { new ShutdownCommand(), new KickCommand(), new PingCommand(), - new GifCommand(config), + new GifCommand(), new ClearCommand(), new GitHubCommand(), new ScreenshareCommand(), 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 14c068e..ae57750 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -19,12 +19,6 @@ import java.util.Random; public class GifCommand implements Command { - private Config config; - - public GifCommand(Config config) { - this.config = config; - } - @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { @@ -35,7 +29,7 @@ public class GifCommand implements Command { } OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + config.getGiphyToken()).build(); + Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + event.getConfig().getGiphyToken()).build(); try { Random rand = new Random(); Response response = caller.newCall(request).execute(); From ccbc0230850f1f1d7cc9b728b2328c2fd1dd7feb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 18:34:14 +0100 Subject: [PATCH 19/41] Yet Another Bot List --- src/main/java/com/bbn/hadder/core/Config.java | 4 ++++ src/main/java/com/bbn/hadder/utils/BotList.java | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 70f030a..83c1485 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -113,4 +113,8 @@ public class Config { public String getDiscordBoatsToken() { return config.getJSONObject("Tokens").getString("DiscordBoats"); } + + public String getYetAnotherBotListToken() { + return config.getJSONObject("Tokens").getString("YetAnotherBotList"); + } } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index aeddf4a..4bbc9d5 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -23,6 +23,7 @@ public class BotList { private static String DiscordBotList = "https://discordbotlist.com/api/bots/637002314162372639/stats"; private static String DiscordBestBots = "https://discordsbestbots.xyz/api/bots/637002314162372639/stats"; private static String DiscordBoats = "https://discord.boats/api/bot/637002314162372639"; + private static String YetAnotherBotList = "https://yabl.xyz/api/bot/637002314162372639/stats"; private Config config; @@ -34,6 +35,7 @@ public class BotList { if (Files.notExists(Paths.get("./DEBUG"))) { JSONObject json = new JSONObject(); json.put("server_count", Hadder.shardManager.getGuilds().size()); + json.put("guildCount", Hadder.shardManager.getGuilds().size()); json.put("guilds", Hadder.shardManager.getGuilds().size()); json.put("users", Hadder.shardManager.getUsers().size()); @@ -113,6 +115,21 @@ public class BotList { } catch (IOException e) { e.printStackTrace(); } + + // Yet Another Bot List + + Request yetanotherbotlist = new Request.Builder() + .url(YetAnotherBotList) + .post(body) + .addHeader("Authorization", config.getYetAnotherBotListToken()) + .build(); + + try { + new OkHttpClient().newCall(yetanotherbotlist).execute().close(); + System.out.println("Successfully postes count to Yet Another Bot List!"); + } catch (IOException e) { + e.printStackTrace(); + } } } From a6e1d8c1f14a250369a36056f2049c382c99e99e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 18:34:48 +0100 Subject: [PATCH 20/41] posted --- src/main/java/com/bbn/hadder/utils/BotList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 4bbc9d5..2cd8a2e 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -126,7 +126,7 @@ public class BotList { try { new OkHttpClient().newCall(yetanotherbotlist).execute().close(); - System.out.println("Successfully postes count to Yet Another Bot List!"); + System.out.println("Successfully posted count to Yet Another Bot List!"); } catch (IOException e) { e.printStackTrace(); } From d9d6dfe195b7c211b8e2860e22eefe77c6188826 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 19:57:11 +0100 Subject: [PATCH 21/41] Perms Check --- .../hadder/commands/general/HelpCommand.java | 75 ++++++++++--------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index bcc800d..62595db 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -4,6 +4,7 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; import java.util.ArrayList; import java.util.HashMap; @@ -13,47 +14,51 @@ public class HelpCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (args.length == 0) { - HashMap> hashMap = new HashMap<>(); - for (Command cmd : event.getCommandHandler().getCommandList()) { - if (!hashMap.containsKey(cmd.getClass().getPackageName())) { - ArrayList cmdlist = new ArrayList<>(); - cmdlist.add(cmd); - hashMap.put(cmd.getClass().getPackageName(), cmdlist); - } else { - hashMap.get(cmd.getClass().getPackageName()).add(cmd); - } - } - EmbedBuilder eb = new EmbedBuilder(); - for (Map.Entry> entry : hashMap.entrySet()) { - if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < entry.getValue().size(); i++) { - Command cmd = entry.getValue().get(i); - sb.append("`" + cmd.labels()[0] + "`"); - if (i < entry.getValue().size() - 1) sb.append(", "); + if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { + if (args.length == 0) { + HashMap> hashMap = new HashMap<>(); + for (Command cmd : event.getCommandHandler().getCommandList()) { + if (!hashMap.containsKey(cmd.getClass().getPackageName())) { + ArrayList cmdlist = new ArrayList<>(); + cmdlist.add(cmd); + hashMap.put(cmd.getClass().getPackageName(), cmdlist); + } else { + hashMap.get(cmd.getClass().getPackageName()).add(cmd); } - String[] packagesplit = entry.getKey().split("\\."); - eb.addField(packagesplit[packagesplit.length - 1], sb.toString(), false); } - } - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); - event.getChannel().sendMessage(eb.build()).queue(); - } else { - for (Command cmd : event.getCommandHandler().getCommandList()) { - for (String label : cmd.labels()) { - if (label.toLowerCase().equals(args[0])) { - if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - EmbedBuilder eb = new EmbedBuilder(); - String name = cmd.labels()[0]; - eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); - eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); - event.getChannel().sendMessage(eb.build()).queue(); + EmbedBuilder eb = new EmbedBuilder(); + for (Map.Entry> entry : hashMap.entrySet()) { + if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < entry.getValue().size(); i++) { + Command cmd = entry.getValue().get(i); + sb.append("`" + cmd.labels()[0] + "`"); + if (i < entry.getValue().size() - 1) sb.append(", "); + } + String[] packagesplit = entry.getKey().split("\\."); + eb.addField(packagesplit[packagesplit.length - 1], sb.toString(), false); + } + } + new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); + event.getChannel().sendMessage(eb.build()).queue(); + } else { + for (Command cmd : event.getCommandHandler().getCommandList()) { + for (String label : cmd.labels()) { + if (label.toLowerCase().equals(args[0])) { + if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { + EmbedBuilder eb = new EmbedBuilder(); + String name = cmd.labels()[0]; + eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); + eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); + new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); + event.getChannel().sendMessage(eb.build()).queue(); + } } } } } + } else { + event.getTextChannel().sendMessage("I need the Embed Links Permission to send the Help Menu!").queue(); } } From 464992ec5a89d0ae089cf6f7d951afa1f385b96f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 20:17:10 +0100 Subject: [PATCH 22/41] Help --- src/main/java/com/bbn/hadder/commands/general/HelpCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 62595db..848c927 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -32,7 +32,7 @@ public class HelpCommand implements Command { StringBuilder sb = new StringBuilder(); for (int i = 0; i < entry.getValue().size(); i++) { Command cmd = entry.getValue().get(i); - sb.append("`" + cmd.labels()[0] + "`"); + sb.append("`").append(cmd.labels()[0]).append("`"); if (i < entry.getValue().size() - 1) sb.append(", "); } String[] packagesplit = entry.getKey().split("\\."); From 0cfa67b6d7605add019e95ec5e21fe3ac0300edb Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:34:57 +0100 Subject: [PATCH 23/41] Create maven.yml --- .github/workflows/maven.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..5d84355 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,17 @@ +name: Java CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.13 + - name: Build with Maven + run: mvn -B package --file pom.xml From 0ebd85907474033c70171433e100ed0c90bec427 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:37:34 +0100 Subject: [PATCH 24/41] Delete .travis.yml --- .travis.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f7aeaa3..0000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: java -jdk: - - openjdk12 - -addons: - apt: - packages: - - sshpass - -after_success: - - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - - chmod +x send.sh - - ./send.sh success $WEBHOOK_URL - - mvn clean compile assembly:single - - cd target - - sshpass -p $SFTP_PASSWORD scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r Hadder-Build.jar $SFTP_USER@$SFTP_IP:/home/Bots/Hadder-Build.jar - - echo $? - - sshpass -p $SFTP_PASSWORD ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $SFTP_IP /home/Bots/deploy.sh - - echo $? - -after_failure: - - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - - chmod +x send.sh - - ./send.sh failure $WEBHOOK_URL From a6ec1596811fdc268f5d7a1741b837ef50ec4f26 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:43:41 +0100 Subject: [PATCH 25/41] Update maven.yml --- .github/workflows/maven.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5d84355..6831a2e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,9 +9,25 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 1.13 uses: actions/setup-java@v1 with: java-version: 1.13 - name: Build with Maven run: mvn -B package --file pom.xml + - name: Copy folder content recursively to remote + uses: garygrossgarten/github-action-scp@release + with: + local: ./target/Hadder-Build.jar + remote: /home/Bots/Hadder-Build.jar + host: ${{ secrets.HOST }} + username: ${{ secrets.SSH_USER }} + password: ${{ secrets.PASSWORD }} + - name: executing remote ssh commands using password + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} + port: ${{ secrets.PORT }} + script: /home/Bots/deploy.sh From 33a74d58ccc8ec972aa5f59c96b83fc15b88ddea Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:51:55 +0100 Subject: [PATCH 26/41] Update maven.yml --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6831a2e..ad43714 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,7 +21,7 @@ jobs: local: ./target/Hadder-Build.jar remote: /home/Bots/Hadder-Build.jar host: ${{ secrets.HOST }} - username: ${{ secrets.SSH_USER }} + username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master From 67e8017f68b339672ee87b3d1a56d73d5ade82b2 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:55:30 +0100 Subject: [PATCH 27/41] Update maven.yml --- .github/workflows/maven.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ad43714..26c3eea 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,4 +30,15 @@ jobs: username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} port: ${{ secrets.PORT }} - script: /home/Bots/deploy.sh + script: /home/Bots/deploy.sh + - name: Send Webhook Notification + if: always() + env: + JOB_STATUS: ${{ job.status }} + WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} + HOOK_OS_NAME: ${{ runner.os }} + WORKFLOW_NAME: ${{ github.workflow }} + run: | + git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook + bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL + shell: bash From d56a78771fda6a33b18e8df5d051b4873646893e Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 21:57:58 +0100 Subject: [PATCH 28/41] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 4f62557..40e2235 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # Hadder -[![Build Status](https://travis-ci.com/BigBotNetwork/Hadder.svg?branch=master)](https://travis-ci.com/BigBotNetwork/Hadder) From 59a3eee5bf761816c6adb991d5f8ce62747cb7e1 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:59:51 +0100 Subject: [PATCH 29/41] Update maven.yml --- .github/workflows/maven.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 26c3eea..6d69b82 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,6 +15,8 @@ jobs: java-version: 1.13 - name: Build with Maven run: mvn -B package --file pom.xml + - name: Build Final Jar + run: mvn clean compile assembly:single - name: Copy folder content recursively to remote uses: garygrossgarten/github-action-scp@release with: From a20b7fac38e897fb079c066cdfd94ec0e96cd1ea Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 22:02:56 +0100 Subject: [PATCH 30/41] DiscordExtremeList --- src/main/java/com/bbn/hadder/core/Config.java | 4 ++++ src/main/java/com/bbn/hadder/utils/BotList.java | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 83c1485..f8df1e0 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -117,4 +117,8 @@ public class Config { public String getYetAnotherBotListToken() { return config.getJSONObject("Tokens").getString("YetAnotherBotList"); } + + public String getDiscordExtremeListToken() { + return config.getJSONObject("Tokens").getString("DiscordExtremeList"); + } } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 2cd8a2e..dcd1bb5 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -24,6 +24,7 @@ public class BotList { private static String DiscordBestBots = "https://discordsbestbots.xyz/api/bots/637002314162372639/stats"; private static String DiscordBoats = "https://discord.boats/api/bot/637002314162372639"; private static String YetAnotherBotList = "https://yabl.xyz/api/bot/637002314162372639/stats"; + private static String DiscordExtremeList = "https://discordextremelist.xyz/api/bot/637002314162372639"; private Config config; @@ -130,6 +131,20 @@ public class BotList { } catch (IOException e) { e.printStackTrace(); } + + // Discord Extreme List + + Request discordextremelist = new Request.Builder() + .url(DiscordExtremeList) + .post(body) + .addHeader("Authorizaion", config.getDiscordExtremeListToken()) + .build(); + + try { + new OkHttpClient().newCall(discordextremelist).execute().close(); + } catch (IOException e) { + e.printStackTrace(); + } } } From bfc2022387a51723bb4369d120cf4abca384c044 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:03:27 +0100 Subject: [PATCH 31/41] Update maven.yml --- .github/workflows/maven.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6d69b82..b133824 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,7 +6,6 @@ jobs: build: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v1 - name: Set up JDK 1.13 From 9f9cbf5a1b56958e6c0647f2cd6ba48e74c2cfa2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:13:58 +0100 Subject: [PATCH 32/41] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 40e2235..dc932a7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ # Hadder + + + From a14188af8a1cd0193ad86bda086fb49f2b31a734 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:22:32 +0100 Subject: [PATCH 33/41] Update maven.yml --- .github/workflows/maven.yml | 85 ++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b133824..1fe03d9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,45 +1,50 @@ -name: Java CI +name: Hadder on: [push] jobs: - build: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.13 + uses: actions/setup-java@v1 + with: + java-version: 1.13 + - name: Build with Maven + run: mvn -B package --file pom.xml - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.13 - uses: actions/setup-java@v1 - with: - java-version: 1.13 - - name: Build with Maven - run: mvn -B package --file pom.xml - - name: Build Final Jar - run: mvn clean compile assembly:single - - name: Copy folder content recursively to remote - uses: garygrossgarten/github-action-scp@release - with: - local: ./target/Hadder-Build.jar - remote: /home/Bots/Hadder-Build.jar - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} - - name: executing remote ssh commands using password - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} - script: /home/Bots/deploy.sh - - name: Send Webhook Notification - if: always() - env: - JOB_STATUS: ${{ job.status }} - WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} - HOOK_OS_NAME: ${{ runner.os }} - WORKFLOW_NAME: ${{ github.workflow }} - run: | - git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook - bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL - shell: bash + deploy: + runs-on: ubuntu-latest + needs: test + if: github.ref == 'refs/heads/master' + steps: + - name: Build Final Jar + run: mvn clean compile assembly:single + - name: Copy folder content recursively to remote + uses: garygrossgarten/github-action-scp@release + with: + local: ./target/Hadder-Build.jar + remote: /home/Bots/Hadder-Build.jar + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} + - name: executing remote ssh commands using password + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} + port: ${{ secrets.PORT }} + script: /home/Bots/deploy.sh + - name: Send Webhook Notification + if: always() + env: + JOB_STATUS: ${{ job.status }} + WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} + HOOK_OS_NAME: ${{ runner.os }} + WORKFLOW_NAME: ${{ github.workflow }} + run: | + git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook + bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL + shell: bash From ef6ca161130fc1e9625cf59df70067fc7e6f8bb8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:22:51 +0100 Subject: [PATCH 34/41] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc932a7..973a73b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder - +[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github/BigBotNetwork/Hadder) From 6f974cd314a32beb5bd7e93a68d9caa83a30769e Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:23:58 +0100 Subject: [PATCH 35/41] .com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 973a73b..d9e474a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder -[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github/BigBotNetwork/Hadder) +[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github.com/BigBotNetwork/Hadder) From 3dbecc7ee6fbf1dd6de76512ab85bd61f1865ae5 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:28:14 +0100 Subject: [PATCH 36/41] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9e474a..d18a179 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder -[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github.com/BigBotNetwork/Hadder) +[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) From 4395bc83dc7fe6e700a56945413874b88d75a1f4 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:28:57 +0100 Subject: [PATCH 37/41] Update maven.yml --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1fe03d9..cf1cf36 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,7 +6,6 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - name: Set up JDK 1.13 uses: actions/setup-java@v1 with: @@ -19,6 +18,7 @@ jobs: needs: test if: github.ref == 'refs/heads/master' steps: + - uses: actions/checkout@v1 - name: Build Final Jar run: mvn clean compile assembly:single - name: Copy folder content recursively to remote From 1fc4248eb9497b80842aeab45e905c76b0ef5a68 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:30:30 +0100 Subject: [PATCH 38/41] Update maven.yml --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cf1cf36..25e641a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,6 +6,7 @@ jobs: test: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v1 - name: Set up JDK 1.13 uses: actions/setup-java@v1 with: From 270aeba086cacbafbedfc81688bc4fb6d56c5ef9 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:35:13 +0100 Subject: [PATCH 39/41] Update maven.yml --- .github/workflows/maven.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 25e641a..aaeb397 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,6 +20,10 @@ jobs: if: github.ref == 'refs/heads/master' steps: - uses: actions/checkout@v1 + - name: Set up JDK 1.13 + uses: actions/setup-java@v1 + with: + java-version: 1.13 - name: Build Final Jar run: mvn clean compile assembly:single - name: Copy folder content recursively to remote From 066db1e17ae7efe1141216626a13bf4550a773ed Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:38:51 +0100 Subject: [PATCH 40/41] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d18a179..2e10a76 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Hadder +Hadder is the best discord bot + [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) From 07553d6753af21eacc334727f6e8d9265fc7fadb Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:40:07 +0100 Subject: [PATCH 41/41] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e10a76..a78d7e1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder -Hadder is the best discord bot +The Hadder Discord bot is a multi-purpose Discord Bot. [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder)