diff --git a/.travis.yml b/.travis.yml
index f7aeaa3..28d0f81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,6 @@ 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
diff --git a/pom.xml b/pom.xml
index bb0869f..700563d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
junit
junit
- 4.12
+ LATEST
test
@@ -75,22 +75,17 @@
maven-compiler-plugin
- 3.8.1
+ 3.8.0
maven-surefire-plugin
- 2.22.2
+ 2.22.1
maven-jar-plugin
- 3.1.2
+ 3.0.2
Hadder-Build
-
-
- com.bbn.hadder.Hadder
-
-
@@ -103,7 +98,7 @@
maven-site-plugin
- 3.8.2
+ 3.7.1
maven-project-info-reports-plugin
@@ -128,21 +123,6 @@
12
-
- maven-assembly-plugin
-
- Hadder-Build
-
-
- com.bbn.hadder.Hadder
-
-
-
- jar-with-dependencies
-
- false
-
-
-
+
\ No newline at end of file
diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 1da65ee..6ec4194 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -24,6 +24,8 @@ import java.util.List;
public class Hadder {
+ public static ShardManager shardManager;
+
public static void main(String[] args) {
startBot();
}
@@ -61,7 +63,7 @@ public class Hadder {
new ReadyListener());
try {
- ShardManager shardManager = builder.build();
+ shardManager = builder.build();
} catch (LoginException e) {
e.printStackTrace();
}
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();
+ }
+
+ }
+
+}