From f94ccbbc521470a68186c282d38e99edd0e7af06 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 4 Oct 2020 09:45:33 +0200 Subject: [PATCH 1/8] 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 aa30f8c..57e260f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -32,7 +32,7 @@ jobs: local: ./target/Hadder-Build.jar remote: /home/Hadder-Build.jar host: ${{ secrets.HOST }} - privateKey: ${{ secrets.PK }} + privateKey: "123" - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: -- 2.45.3 From 94366466333232f87c876c2a948b569a3198dce5 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 4 Oct 2020 09:53:35 +0200 Subject: [PATCH 2/8] 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 57e260f..aa30f8c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -32,7 +32,7 @@ jobs: local: ./target/Hadder-Build.jar remote: /home/Hadder-Build.jar host: ${{ secrets.HOST }} - privateKey: "123" + privateKey: ${{ secrets.PK }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: -- 2.45.3 From 112ea391ba8f09a3ea8350fc8ccc489519d90fb1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Oct 2020 13:15:58 +0000 Subject: [PATCH 3/8] Bump JDA from 4.2.0_207 to 4.2.0_208 Bumps JDA from 4.2.0_207 to 4.2.0_208. 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 0fae6af..215d500 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_207 + 4.2.0_208 org.json -- 2.45.3 From 4ae9459ca3ef44d7bb1d86e98bd3743363d9e255 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 6 Oct 2020 20:01:29 +0200 Subject: [PATCH 4/8] Update maven.yml --- .github/workflows/maven.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index aa30f8c..76967c6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,8 +30,10 @@ jobs: uses: garygrossgarten/github-action-scp@release with: local: ./target/Hadder-Build.jar - remote: /home/Hadder-Build.jar + remote: /home/bots/Hadder/Hadder-Build.jar host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + passphrase: ${{ secrets.PASSWORD }} privateKey: ${{ secrets.PK }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master -- 2.45.3 From 082dbb6c33e2f32c0b5f3511e0ea7766df7eb22f Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 6 Oct 2020 20:10:10 +0200 Subject: [PATCH 5/8] Update maven.yml --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 76967c6..5fc6c94 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -34,13 +34,13 @@ jobs: host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} passphrase: ${{ secrets.PASSWORD }} - privateKey: ${{ secrets.PK }} + privateKey: ${{ secrets.PRIVATE_KEY }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: host: ${{ secrets.HOST }} port: ${{ secrets.PORT }} - key: ${{ secrets.PK }} + key: ${{ secrets.PRIVATE_KEY }} script: /home/deploy.sh - name: Send Webhook Notification if: always() -- 2.45.3 From 750dfaeebd03a9640df59f6f77a6d50ac9e3fdd4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 13:19:46 +0000 Subject: [PATCH 6/8] Bump JDA from 4.2.0_208 to 4.2.0_209 Bumps JDA from 4.2.0_208 to 4.2.0_209. 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 215d500..67e95f8 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_208 + 4.2.0_209 org.json -- 2.45.3 From 656cce485132f8f05405bcc804d42b28c7c49f13 Mon Sep 17 00:00:00 2001 From: Greg Date: Tue, 13 Oct 2020 22:37:14 +0200 Subject: [PATCH 7/8] Fix minor bug --- .../hadder/listener/InviteLinkListener.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index d0d8b13..f845009 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -43,7 +43,7 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent e) { - scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember()); + if (e.isFromType(ChannelType.TEXT)) scanMessage(e.getGuild(), e.getMessage(), e.getMember()); } public void checkInvite(Message message, String regex) { @@ -64,19 +64,17 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { - scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember()); + if (e.isFromType(ChannelType.TEXT)) scanMessage(e.getGuild(), e.getMessage(), e.getMember()); } - public void scanMessage(boolean fromType, Guild guild, Message message, Member member) { - if (fromType) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink); - if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { - checkInvite(message, "discord.gg/"); - } else if (message.getContentRaw().contains("discord.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { - checkInvite(message, "discord.com/invite/"); - } else if (message.getContentRaw().contains("discordapp.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { - checkInvite(message, "discordapp.com/invite/"); - } + public void scanMessage(Guild guild, Message message, Member member) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink); + if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { + checkInvite(message, "discord.gg/"); + } else if (message.getContentRaw().contains("discord.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { + checkInvite(message, "discord.com/invite/"); + } else if (message.getContentRaw().contains("discordapp.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { + checkInvite(message, "discordapp.com/invite/"); } } } -- 2.45.3 From a0e4a950282563537ed57f9b1413dff83ef8f5bc Mon Sep 17 00:00:00 2001 From: Greg Date: Tue, 13 Oct 2020 22:42:50 +0200 Subject: [PATCH 8/8] Bump Hadder verison --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67e95f8..28a2f3f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 Hadder Hadder - 1.3.17 + 1.3.18 Hadder 2019 Hadder is a multi-purpose Discord bot. -- 2.45.3