From 101a31f3388436f89fdd0966b4742574045bafbd Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 10 Nov 2019 20:48:18 +0100 Subject: [PATCH 01/10] 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) + -- 2.45.3 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 02/10] 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 -- 2.45.3 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 03/10] 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 -- 2.45.3 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 04/10] 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 -- 2.45.3 From 9e09944fff6c2e61334821328b641648f4e85082 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 16:30:13 +0100 Subject: [PATCH 05/10] 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 -- 2.45.3 From 464992ec5a89d0ae089cf6f7d951afa1f385b96f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 20:17:10 +0100 Subject: [PATCH 06/10] 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("\\."); -- 2.45.3 From 0cfa67b6d7605add019e95ec5e21fe3ac0300edb Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:34:57 +0100 Subject: [PATCH 07/10] 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 -- 2.45.3 From 0ebd85907474033c70171433e100ed0c90bec427 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:37:34 +0100 Subject: [PATCH 08/10] 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 -- 2.45.3 From d56a78771fda6a33b18e8df5d051b4873646893e Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 21:57:58 +0100 Subject: [PATCH 09/10] 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) -- 2.45.3 From a20b7fac38e897fb079c066cdfd94ec0e96cd1ea Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 22:02:56 +0100 Subject: [PATCH 10/10] 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(); + } } } -- 2.45.3