From c14c2806c39c8353579dbd21b38b75de9b8987ba Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 16:39:22 +0100 Subject: [PATCH 01/25] Create .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..921a18f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: java +jdk: + - oraclejdk11 + - openjdk11 From 6205c359abb65332509bfaf2e6f476116fd4fe88 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 16:40:29 +0100 Subject: [PATCH 02/25] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 921a18f..b9f4e7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,5 @@ language: java jdk: - oraclejdk11 - openjdk11 + - oraclejdk12 + - openjdk12 From 89986cf371bb25d55f7269fb932249c854b89b11 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 16:41:26 +0100 Subject: [PATCH 03/25] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9f4e7c..3788406 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ language: java jdk: - - oraclejdk11 - - openjdk11 - oraclejdk12 - openjdk12 From fd80e95a06c454b887bd6a656d2c21bae7ec53c6 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 16:45:23 +0100 Subject: [PATCH 04/25] Update .travis.yml --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3788406..498561e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,12 @@ language: java jdk: - oraclejdk12 - openjdk12 + +after_success: + - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh + - chmod +x send.sh + - ./send.sh success $WEBHOOK_URL +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 ba1ffa3650b65d45c1e78a7d66690085bb317200 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 16:56:48 +0100 Subject: [PATCH 05/25] Update .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 498561e..b80757b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,10 @@ after_success: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh - ./send.sh success $WEBHOOK_URL + + - curl --ftp-create-dirs + -T filename + sftp://${SFTP_USER}:${SFTP_PASSWORD}@${SFTP_IP}${SFTP_DIR} after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh From 67a982ed4c3991cae3531eb2bde407d53bc0f5be Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 17:01:27 +0100 Subject: [PATCH 06/25] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b80757b..24aa73d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ after_success: - chmod +x send.sh - ./send.sh success $WEBHOOK_URL - - curl --ftp-create-dirs - -T filename + - curl -T filename sftp://${SFTP_USER}:${SFTP_PASSWORD}@${SFTP_IP}${SFTP_DIR} after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From 35e0c9ea94ca3d5cf3845c7944f0f37519ca4ae7 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 17:07:39 +0100 Subject: [PATCH 07/25] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24aa73d..67b188f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ after_success: - chmod +x send.sh - ./send.sh success $WEBHOOK_URL - - curl -T filename + - curl -T Hadder.jar --g sftp://${SFTP_USER}:${SFTP_PASSWORD}@${SFTP_IP}${SFTP_DIR} after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From fc864c62cdb492276972efca94507a2eb4b59875 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 17:09:58 +0100 Subject: [PATCH 08/25] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 67b188f..f863ba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ after_success: - chmod +x send.sh - ./send.sh success $WEBHOOK_URL - - curl -T Hadder.jar --g + - curl -T Hadder.jar -g sftp://${SFTP_USER}:${SFTP_PASSWORD}@${SFTP_IP}${SFTP_DIR} after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From 494ba31d3f7d8f54cff05d9a6b754e401fc06cea Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 17:33:42 +0100 Subject: [PATCH 09/25] Update .travis.yml --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f863ba5..3fc20a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,20 @@ jdk: - oraclejdk12 - 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 - - curl -T Hadder.jar -g - sftp://${SFTP_USER}:${SFTP_PASSWORD}@${SFTP_IP}${SFTP_DIR} + - export SYMFONY_ENV=prod && composer install --no-dev -o + - export SSHPASS=$SFTP_PASSWORD + - sshpass -e scp Hadder.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR + - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh From 8ee0ba8ceb7fcefa1bc073376290217997c66230 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 17:35:52 +0100 Subject: [PATCH 10/25] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3fc20a3..dcf4d7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ after_success: - chmod +x send.sh - ./send.sh success $WEBHOOK_URL - - export SYMFONY_ENV=prod && composer install --no-dev -o - export SSHPASS=$SFTP_PASSWORD - sshpass -e scp Hadder.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh From 81ead2ab4e7e73bcd352973d996e77c8eb11a286 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 17:37:52 +0100 Subject: [PATCH 11/25] =?UTF-8?q?Digga=20h=C3=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcf4d7a..a3702fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ jdk: - oraclejdk12 - openjdk12 - addons: - apt: - packages: - - sshpass +addons: + apt: + packages: + - sshpass after_success: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From c0d6ba08b8a3fea3952f5f2e5866697c97bc3fc0 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 17:48:55 +0100 Subject: [PATCH 12/25] Update .travis.yml --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3702fd..498561e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,19 +3,10 @@ jdk: - oraclejdk12 - 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 - - - export SSHPASS=$SFTP_PASSWORD - - sshpass -e scp Hadder.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR - - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh From e39b8f90d1f7d7fec9e3b72349ae2ed35bcaafc0 Mon Sep 17 00:00:00 2001 From: Skidder <33130539+GregTCLTK@users.noreply.github.com> Date: Tue, 29 Oct 2019 18:39:43 +0100 Subject: [PATCH 13/25] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f56e59..cd779c4 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# Hadder \ No newline at end of file +# Hadder + +[![Build Status](https://travis-ci.com/BigBotNetwork/Hadder.svg?branch=master)](https://travis-ci.com/BigBotNetwork/Hadder) From eab67874a8f77fd17fffd32c783faeb968eed9c1 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 18:48:17 +0100 Subject: [PATCH 14/25] Update .travis.yml --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 498561e..a3702fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,19 @@ jdk: - oraclejdk12 - 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 + + - export SSHPASS=$SFTP_PASSWORD + - sshpass -e scp Hadder.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR + - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh From 3f674529365965ce992510f05fc2eeb5f314b54f Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 18:51:56 +0100 Subject: [PATCH 15/25] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3702fd..616609d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ after_success: - ./send.sh success $WEBHOOK_URL - export SSHPASS=$SFTP_PASSWORD - - sshpass -e scp Hadder.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR + - sshpass -e scp Hadder-Build.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From 653f63044907900ffe048e23d065923fb41fee00 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 18:52:25 +0100 Subject: [PATCH 16/25] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 616609d..0e51d32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ after_success: - chmod +x send.sh - ./send.sh success $WEBHOOK_URL + + - ls - export SSHPASS=$SFTP_PASSWORD - sshpass -e scp Hadder-Build.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh From bb46df130e4c3eb797163c650121a4d523023c97 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 19:04:16 +0100 Subject: [PATCH 17/25] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0e51d32..ee79eac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ after_success: - ./send.sh success $WEBHOOK_URL - - ls + - mvn package + - cd target - export SSHPASS=$SFTP_PASSWORD - sshpass -e scp Hadder-Build.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh From 56604a6e4b30ebfb4329a0ca3cd7c0eee14ce426 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 19:05:08 +0100 Subject: [PATCH 18/25] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee79eac..92f6258 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: java jdk: - - oraclejdk12 - openjdk12 addons: From b9d51620a57d50523c4b13d6219030611789777e Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 19:08:25 +0100 Subject: [PATCH 19/25] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 92f6258..8561edc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ after_success: - mvn package - cd target + - ls - export SSHPASS=$SFTP_PASSWORD - sshpass -e scp Hadder-Build.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh From 78c8fbc998597031f1dce08f41da1d702acf9ae6 Mon Sep 17 00:00:00 2001 From: Hax Date: Tue, 29 Oct 2019 21:36:47 +0100 Subject: [PATCH 20/25] Update .travis.yml --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8561edc..28d0f81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,6 @@ after_success: - chmod +x send.sh - ./send.sh success $WEBHOOK_URL - - - mvn package - - cd target - - ls - - export SSHPASS=$SFTP_PASSWORD - - sshpass -e scp Hadder-Build.jar $SFTP_USER@$SFTP_IP:$SFTP_DIR - - sshpass -e ssh $SFTP_USER@$SFTP_IP $SFTP_DIR/deploy.sh after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh From f91aca21ee596abda10efe619959d9a3f2819970 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 30 Oct 2019 16:26:41 +0100 Subject: [PATCH 21/25] Moving Test Command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +-- .../com/bbn/hadder/commands/{ => general}/TestCommand.java | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) rename src/main/java/com/bbn/hadder/commands/{ => general}/TestCommand.java (76%) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 6f315ed..777ef51 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -1,8 +1,7 @@ package com.bbn.hadder; -import com.bbn.hadder.commands.TestCommand; +import com.bbn.hadder.commands.general.*; import com.bbn.hadder.commands.fun.GifCommand; -import com.bbn.hadder.commands.general.PingCommand; import com.bbn.hadder.commands.moderation.*; import com.bbn.hadder.commands.owner.ShutdownCommand; import com.bbn.hadder.commands.settings.PrefixCommand; diff --git a/src/main/java/com/bbn/hadder/commands/TestCommand.java b/src/main/java/com/bbn/hadder/commands/general/TestCommand.java similarity index 76% rename from src/main/java/com/bbn/hadder/commands/TestCommand.java rename to src/main/java/com/bbn/hadder/commands/general/TestCommand.java index d31867a..b4ca20d 100644 --- a/src/main/java/com/bbn/hadder/commands/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/TestCommand.java @@ -1,11 +1,16 @@ -package com.bbn.hadder.commands; +package com.bbn.hadder.commands.general; /* * @author Skidder / GregTCLTK */ +import com.bbn.hadder.commands.Command; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +/* + * @author Skidder / GregTCLTK + */ + public class TestCommand implements Command { public void executed(String[] args, MessageReceivedEvent event) { From d59d98f184f17d852083b96cf171aafcac049154 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 30 Oct 2019 16:42:04 +0100 Subject: [PATCH 22/25] =?UTF-8?q?=E2=80=9EMach=20den=20Beat=20wieder=20an!?= =?UTF-8?q?=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/bbn/hadder/Rethink.java | 1 - .../commands/settings/PrefixCommand.java | 19 +++++++------------ .../com/bbn/hadder/core/CommandParser.java | 2 +- .../bbn/hadder/listener/CommandListener.java | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 68fa912..5991325 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -65,7 +65,6 @@ public class Rethink { try { Cursor cursor = r.table("server") .insert(r.hashMap("id", id) - .with("prefix", "h.") ).run(conn); out = cursor.next().toString(); } catch (ClassCastException ignored) {} diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index 86bfbca..07fc48e 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -14,26 +14,21 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; public class PrefixCommand implements Command { public void executed(String[] args, MessageReceivedEvent event) { - if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MANAGE_SERVER)) { - if (args.length == 1) { - if (!args[0].contains("\"")) { + if (args.length == 1) { + if (!args[0].contains("\"")) { - Rethink.update("server", event.getGuild().getId(), "prefix", args[0]); + Rethink.update("user", event.getAuthor().getId(), "prefix", args[0]); - EmbedBuilder builder = new EmbedBuilder(); + EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for this server to " + args[0]).build()).queue(); - } else { - EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue(); - } + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to set a prefix.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to set a prefix.").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/core/CommandParser.java b/src/main/java/com/bbn/hadder/core/CommandParser.java index a801d9f..4bcf0d0 100644 --- a/src/main/java/com/bbn/hadder/core/CommandParser.java +++ b/src/main/java/com/bbn/hadder/core/CommandParser.java @@ -13,7 +13,7 @@ import java.util.Collections; public class CommandParser { public static commandContainer parser(String raw, MessageReceivedEvent event) { - String cmd = raw.replaceFirst(Rethink.get("server", "id", event.getGuild().getId(), "prefix"), ""); + String cmd = raw.replaceFirst(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"), ""); String[] cmdsplit = cmd.split(" "); String invoke = cmdsplit[0]; ArrayList split = new ArrayList<>(); diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index a3cfa4f..81485f2 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -19,7 +19,7 @@ public class CommandListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().startsWith(Rethink.get("server", "id", event.getGuild().getId(), "prefix"))) { + if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) { if (!event.getAuthor().isBot()) { CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event)); } else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) { From 76631876807eadd3725656f2465c18d2d7293079 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 30 Oct 2019 20:23:47 +0100 Subject: [PATCH 23/25] Fixing annoying errors --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index b6536b8..2dda11f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,16 @@ gson LATEST + + org.slf4j + slf4j-api + 1.7.5 + + + org.slf4j + slf4j-simple + 1.6.4 + From 16a20c4173e721a34945c749c0a3d5f55981b511 Mon Sep 17 00:00:00 2001 From: Skidder <33130539+GregTCLTK@users.noreply.github.com> Date: Wed, 30 Oct 2019 20:58:00 +0100 Subject: [PATCH 24/25] Create CONTRIBUTING.md --- CONTRIBUTING.md | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..dca2500 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,80 @@ +# Contributing + +When contributing to this repository, please first discuss the change you wish to make via issue, +email, or any other method with the owners of this repository before making a change. + +Please note we have a code of conduct, please follow it in all your interactions with the project. + +## Pull Request Process + +1. Ensure any install or build dependencies are removed before the end of the layer when doing a + build. +2. You may merge the Pull Request in once you have the sign-off of two other developers, or if you + do not have permission to do that, you may request the second reviewer to merge it for you. + +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +### Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team on [Discord](https://discordapp.com/invite/Vf4zCYn). All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. From b018a293abc64e50db3a9c4de0f2696298b9cde4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 30 Oct 2019 21:32:35 +0100 Subject: [PATCH 25/25] Adding GitHub Stats Command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/misc/GitHubCommand.java | 76 +++++++++++++++++++ .../bbn/hadder/listener/CommandListener.java | 4 +- 3 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 777ef51..ce583e1 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -2,6 +2,7 @@ package com.bbn.hadder; import com.bbn.hadder.commands.general.*; import com.bbn.hadder.commands.fun.GifCommand; +import com.bbn.hadder.commands.misc.GitHubCommand; import com.bbn.hadder.commands.moderation.*; import com.bbn.hadder.commands.owner.ShutdownCommand; import com.bbn.hadder.commands.settings.PrefixCommand; @@ -45,7 +46,7 @@ public class Hadder { builder.setToken(config.getString("Token")); - CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand(), new PingCommand(), new GifCommand(), new ClearCommand())); + CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand(), new PingCommand(), new GifCommand(), new ClearCommand(), new GitHubCommand())); builder.addEventListeners( new MentionListener(), diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java new file mode 100644 index 0000000..4900887 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -0,0 +1,76 @@ +package com.bbn.hadder.commands.misc; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; + +public class GitHubCommand implements Command { + @Override + public void executed(String[] args, MessageReceivedEvent 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"; + try { + bio = json.getString("bio"); + } catch (JSONException e) { + + } + try { + location = json.getString("location"); + } catch (JSONException e) { + + } + + 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(); + } + } + + @Override + public String[] labels() { + return new String[]{"GitHub"}; + } +} diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index 81485f2..ae07609 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -8,8 +8,6 @@ import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import javax.annotation.Nonnull; - /* * @author Skidder / GregTCLTK */ @@ -17,7 +15,7 @@ import javax.annotation.Nonnull; public class CommandListener extends ListenerAdapter { @Override - public void onMessageReceived(@Nonnull MessageReceivedEvent event) { + public void onMessageReceived(MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT)) { if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) { if (!event.getAuthor().isBot()) {