diff --git a/pom.xml b/pom.xml
index 42ab70c..0e927f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,19 @@
4.0.0
Hadder
Hadder
- 1.1.0
-
+ 1.1.1
Hadder
+ 2019
+ Hadder is a multi-purpose Discord bot.
+ https://github.com/BigBotNetwork/Hadder
+
+
+
+ GNU Affero General Public License v3.0
+ https://www.gnu.org/licenses/agpl-3.0.en.html
+ repo
+
+
UTF-8
@@ -56,7 +66,7 @@
net.dv8tion
JDA
- 4.1.1_108
+ 4.1.1_110
org.json
@@ -81,7 +91,7 @@
org.kohsuke
github-api
- 1.106
+ 1.107
com.sedmelluq
@@ -91,7 +101,7 @@
com.fasterxml.jackson.core
jackson-annotations
- 2.10.2
+ 2.10.3
diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
index 6127fce..68e3f68 100644
--- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
@@ -16,7 +16,6 @@
package com.bbn.hadder.commands.general;
-import com.bbn.hadder.Hadder;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
@@ -32,8 +31,8 @@ public class InviteCommand implements Command {
"",
"commands.general.invite.success.description",
"(https://discordapp.com/oauth2/authorize?client_id="
- + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId()
- + "&scope=bot&permissions=470133879)")
+ + e.getJDA().getSelfUser().getId()
+ + "&scope=bot&permissions=1043852663)")
.build()).queue();
}
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
index 48d54d2..756c327 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
@@ -56,7 +56,7 @@ public class RulesCommand implements Command {
try {
TextChannel channel = e1.getGuild().getTextChannelsByName(e1.getMessage().getContentRaw(), true).get(0);
createRules(e, e1, channel);
- } catch (NullPointerException ex) {
+ } catch (NullPointerException | IndexOutOfBoundsException ex) {
e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage(
MessageEditor.MessageType.ERROR,
diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java
index b8fc4cf..2af7ff2 100644
--- a/src/main/java/com/bbn/hadder/core/Config.java
+++ b/src/main/java/com/bbn/hadder/core/Config.java
@@ -70,17 +70,22 @@ public class Config {
.key("Tokens").object()
.key("BotToken").value(null)
.key("Giphy").value(null)
+ .key("GitHub").value(null)
.key("MythicalBotList").value(null)
.key("BotsForDiscord").value(null)
.key("DiscordBotList").value(null)
- .key("DiscordBestBots").value(null)
.key("DiscordBoats").value(null)
.key("YetAnotherBotList").value(null)
- .value("DiscordExtremeList").value(null)
- .value("DiscordBotReviews").value(null)
- .value("DiscordBots").value(null)
- .value("BotListSpace").value(null)
- .endObject().endObject().toString();
+ .key("DiscordExtremeList").value(null)
+ .key("DiscordBotReviews").value(null)
+ .key("DiscordBots").value(null)
+ .key("BotListSpace").value(null)
+ .key("DiscordBots2").value(null)
+ .key("CloudList").value(null)
+ .key("Arcane").value(null)
+ .endObject()
+ .key("Clyde").value("Clyde")
+ .endObject().toString();
}
public String getBotToken() {
@@ -143,10 +148,6 @@ public class Config {
return config.getJSONObject("Tokens").getString("DiscordExtremeList");
}
- public String getDiscordBotReviewsToken() {
- return config.getJSONObject("Tokens").getString("DiscordBotReviews");
- }
-
public String getDiscordBotsToken() {
return config.getJSONObject("Tokens").getString("DiscordBots");
}
@@ -163,6 +164,10 @@ public class Config {
return config.getJSONObject("Tokens").getString("CloudList");
}
+ public String getArcaneToken() {
+ return config.getJSONObject("Tokens").getString("Arcane");
+ }
+
public String getClydeName() {
return config.getString("Clyde");
}
diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java
index cf5890b..3abfe8d 100644
--- a/src/main/java/com/bbn/hadder/utils/BotList.java
+++ b/src/main/java/com/bbn/hadder/utils/BotList.java
@@ -40,6 +40,7 @@ public class BotList {
private static String BotListSpace = "https://api.botlist.space/v1/bots/637002314162372639";
private static String DiscordBots2 = "https://discord.bots.gg/api/v1/bots/637002314162372639/stats";
private static String CloudList = "https://www.cloudlist.xyz/api/stats/637002314162372639";
+ private static String ArcaneBotCenter = "https://arcane-botcenter.xyz/api/637002314162372639/stats";
private Config config;
@@ -57,6 +58,7 @@ public class BotList {
json.put("users", Hadder.shardManager.getUsers().size());
json.put("shard_count", Hadder.shardManager.getShards().size());
json.put("shardCount", Hadder.shardManager.getShards().size());
+ json.put("member_count", Hadder.shardManager.getUsers().size());
RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString());
@@ -209,6 +211,21 @@ public class BotList {
} catch (IOException e) {
e.printStackTrace();
}
+
+ // Arcane Bot Center
+
+ Request arcane = new Request.Builder()
+ .url(ArcaneBotCenter)
+ .post(body)
+ .addHeader("Authorization", config.getArcaneToken())
+ .build();
+
+ try {
+ new OkHttpClient().newCall(arcane).execute().close();
+ System.out.println("Successfully posted count to the Arcane Bot Center!");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
}