From 728b2a50fc39d918b8e64a70b2131573fe1d15ea Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 14:34:53 +0000 Subject: [PATCH 01/17] Bump maven-surefire-plugin from 2.22.1 to 2.22.2 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.22.1 to 2.22.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.22.1...surefire-2.22.2) 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 700563d..dcaeea3 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ maven-surefire-plugin - 2.22.1 + 2.22.2 maven-jar-plugin From 7296514e0b854b41d4b42c051eaf58e11b055060 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 14:35:36 +0000 Subject: [PATCH 02/17] Bump maven-jar-plugin from 3.0.2 to 3.1.2 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.0.2 to 3.1.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.0.2...maven-jar-plugin-3.1.2) 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 700563d..a3cade9 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ maven-jar-plugin - 3.0.2 + 3.1.2 Hadder-Build From 9678beafad669fbed1d1d480883e1ca24e771fde Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 14:35:44 +0000 Subject: [PATCH 03/17] Bump maven-compiler-plugin from 3.8.0 to 3.8.1 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.0...maven-compiler-plugin-3.8.1) 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 700563d..a4bdc0e 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ maven-compiler-plugin - 3.8.0 + 3.8.1 maven-surefire-plugin From 591d9fe08279c13b8b014f9fe7df1ece6ca1d0d4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 14:36:56 +0000 Subject: [PATCH 04/17] Bump junit from LATEST to 4.12 Bumps [junit](https://github.com/junit-team/junit) from LATEST to 4.12. - [Release notes](https://github.com/junit-team/junit/releases) - [Changelog](https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit/commits/r4.12) 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 700563d..d920841 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ junit junit - LATEST + 4.12 test From 867dd19258d17ce005800c8303663949c52f6659 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 14:37:14 +0000 Subject: [PATCH 05/17] Bump maven-site-plugin from 3.7.1 to 3.8.2 Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.7.1 to 3.8.2. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.7.1...maven-site-plugin-3.8.2) 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 700563d..7af842b 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ maven-site-plugin - 3.7.1 + 3.8.2 maven-project-info-reports-plugin From c3d7d808d1c10ef0d655ccbfedeb23fe05a32231 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 19:19:23 +0100 Subject: [PATCH 06/17] Added Manifest to maven --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 0482fd8..3b58062 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,11 @@ 3.1.2 Hadder-Build + + + com.bbn.hadder.Hadder + + From cac32ee6c200f4c8acaa1d204ce71ac353515b15 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 19:19:58 +0100 Subject: [PATCH 07/17] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 28d0f81..4061375 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ 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 package + - cd target + - sshpass -p "$SSH_PASSWORD" scp -r $SSH_USER@$SSH_URL:/home/Bots/Hadder-Build.jar Hadder-Build.jar after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From 15b4c3427485d3aae74129d5ab62d00bbab7d3a9 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 19:21:17 +0100 Subject: [PATCH 08/17] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4061375..fcc776f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ after_success: - ./send.sh success $WEBHOOK_URL - mvn package - cd target - - sshpass -p "$SSH_PASSWORD" scp -r $SSH_USER@$SSH_URL:/home/Bots/Hadder-Build.jar Hadder-Build.jar + - sshpass -p "$SFTP_PASSWORD" scp -r $SFTP_USER@$SFTP_IP:/home/Bots/Hadder-Build.jar Hadder-Build.jar after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From 47f9a83185f13cf5aea02034929e0a0aca306554 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 20:01:35 +0100 Subject: [PATCH 09/17] !===X COOLER --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fcc776f..6af09e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,8 @@ after_success: - ./send.sh success $WEBHOOK_URL - mvn package - cd target - - sshpass -p "$SFTP_PASSWORD" scp -r $SFTP_USER@$SFTP_IP:/home/Bots/Hadder-Build.jar Hadder-Build.jar + - 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 $? after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh From 280d8ad9bc8f2af4e3df76d5cf33b97090e78ceb Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 20:19:08 +0100 Subject: [PATCH 10/17] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6af09e7..34d8a4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ after_success: - mvn package - 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 $SFTP_IP ./home/Bots/deploy.sh - echo $? after_failure: From 18cbce4dd187b43427f53d47032625b85522f11c Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 20:21:49 +0100 Subject: [PATCH 11/17] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34d8a4c..5ea41d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ after_success: - 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 $SFTP_IP ./home/Bots/deploy.sh + - sshpass -p $SFTP_PASSWORD ssh $SFTP_IP /home/Bots/deploy.sh - echo $? after_failure: From 6d8e53d9cf9c26de1af45054f831cf0e2f2e7d39 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 21:02:00 +0100 Subject: [PATCH 12/17] Test it --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ea41d9..3ca261a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ after_success: - 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 $SFTP_IP /home/Bots/deploy.sh + - sshpass -p $SFTP_PASSWORD ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $SFTP_IP /home/Bots/deploy.sh - echo $? after_failure: From 0aabd53902b62676bcced5a3ac40e86a5a846a4a Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 23:43:11 +0100 Subject: [PATCH 13/17] Update pom.xml --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b58062..951b4f8 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,19 @@ 12 + + maven-assembly-plugin + + + + fully.qualified.MainClass + + + + jar-with-dependencies + + + - \ No newline at end of file + From 451843d67a15ee2fdd09b604efad24a5fb164192 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 23:46:19 +0100 Subject: [PATCH 14/17] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ca261a..f7aeaa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ 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 package + - 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 $? From fe904c0a71e4c1ca8676223109e1161e434f2a95 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 1 Nov 2019 23:56:46 +0100 Subject: [PATCH 15/17] Update pom.xml --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 951b4f8..30f8e49 100644 --- a/pom.xml +++ b/pom.xml @@ -131,9 +131,10 @@ maven-assembly-plugin + Hadder-Build - fully.qualified.MainClass + com.bbn.hadder.Hadder From 95e023bf5f507f3dbf24423f38eea0c61d694dfd Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 2 Nov 2019 00:03:08 +0100 Subject: [PATCH 16/17] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 30f8e49..bb0869f 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,7 @@ jar-with-dependencies + false From ace8587f96ba1ab6405051277d6d31c4915cef54 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 01:31:32 +0100 Subject: [PATCH 17/17] First Bot List Integration --- .../bbn/hadder/listener/GuildListener.java | 5 ++ .../bbn/hadder/listener/ReadyListener.java | 3 + .../java/com/bbn/hadder/utils/BotList.java | 55 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/utils/BotList.java diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 2ac0825..f37bd2c 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -5,6 +5,7 @@ package com.bbn.hadder.listener; */ import com.bbn.hadder.Rethink; +import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; @@ -34,6 +35,8 @@ public class GuildListener extends ListenerAdapter { .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); + + BotList.post(); } public void onGuildLeave(GuildLeaveEvent event) { @@ -46,6 +49,8 @@ public class GuildListener extends ListenerAdapter { .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); + + BotList.post(); } public void onGuildMemberJoin(GuildMemberJoinEvent event) { diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 4d24a2b..a007c31 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -1,6 +1,7 @@ package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; +import com.bbn.hadder.utils.BotList; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.ReadyEvent; @@ -21,5 +22,7 @@ public class ReadyListener extends ListenerAdapter { for (Guild g : event.getJDA().getGuilds()) { Rethink.insertServer(g.getId()); } + + BotList.post(); } } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java new file mode 100644 index 0000000..b4ac8ed --- /dev/null +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -0,0 +1,55 @@ +package com.bbn.hadder.utils; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.Hadder; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import org.json.JSONObject; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +public class BotList { + + private static String MythicalBotList = "https://mythicalbots.xyz/api"; + + private static JSONObject json = new JSONObject(); + + public static void post() { + json.put("server_count", Hadder.shardManager.getGuilds().size()); + + RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString()); + + File configfile = new File("./config.json"); + + JSONObject config = null; + try { + config = new JSONObject(new String(Files.readAllBytes(Paths.get(configfile.toURI())))); + } catch (IOException e) { + e.printStackTrace(); + } + + // Mythical Bot List + Request mythicalbotlist = new Request.Builder() + .url(MythicalBotList) + .post(body) + .addHeader("Authorization", config.getString("MythicalBotList")) + .build(); + + try { + new OkHttpClient().newCall(mythicalbotlist).execute().close(); + System.out.println("Successfully posted count for the Mythical Bot List!"); + } catch (IOException e) { + e.printStackTrace(); + } + + } + +}