diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 5d84355..0000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,17 +0,0 @@ -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 diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f7aeaa3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +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 diff --git a/README.md b/README.md index 40e2235..cd779c4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Hadder - +[![Build Status](https://travis-ci.com/BigBotNetwork/Hadder.svg?branch=master)](https://travis-ci.com/BigBotNetwork/Hadder) diff --git a/pom.xml b/pom.xml index 7afe0e1..23bcffe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Hadder Hadder - 0.7.1-ALPHA + 0.7-ALPHA Hadder @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_61 + 4.0.0_56 org.json 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("\\."); 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(); + } } }