Merge pull request #117 from BigBotNetwork/greg-dev

New BotList

README.md

@@ -4,6 +4,8 @@ The Hadder Discord Bot is a multi-purpose Discord Bot.
 
 <a href="https://discord.gg/58My2dM"><img src="https://discordapp.com/api/guilds/448554629282922527/embed.png"/></a>
 [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BigBotNetwork/Hadder?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=BigBotNetwork/Hadder&amp;utm_campaign=Badge_Grade)
 
 <a href="https://discordextremelist.xyz/bots/Hadder"><img src="https://discordextremelist.xyz/api/bot/637002314162372639/widget"/></a>
 [![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639)
+[![Hadder's Widget](https://api.botlist.space/widget/637002314162372639/2 "Hadder's Widget")](https://botlist.space/bot/637002314162372639?utm_source=bls&utm_medium=widget&utm_campaign=637002314162372639)

src/main/java/com/bbn/hadder/Hadder.java

@@ -35,6 +35,7 @@ public class Hadder {
 
         DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder();
 
+        builder.setAutoReconnect(true);
         builder.setShardsTotal(1);
         builder.setActivity(Activity.streaming("on the BigBotNetwork", "https://twitch.tv/BigBotNetwork"));
         builder.setToken(config.getBotToken());

src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java

@@ -3,7 +3,6 @@ package com.bbn.hadder.commands.moderation;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;

src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java

@@ -7,7 +7,6 @@ package com.bbn.hadder.commands.nsfw;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;

src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java

@@ -7,7 +7,6 @@ package com.bbn.hadder.commands.nsfw;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;

src/main/java/com/bbn/hadder/core/Config.java

@@ -137,4 +137,8 @@ public class Config {
     public String getDiscordBotsToken() {
         return config.getJSONObject("Tokens").getString("DiscordBots");
     }
+
+    public String getBotListSpaceToken() {
+        return config.getJSONObject("Tokens").getString("BotListSpace");
+    }
 }

src/main/java/com/bbn/hadder/listener/CommandListener.java

@@ -22,14 +22,12 @@ public class CommandListener extends ListenerAdapter {
 
     @Override
     public void onMessageReceived(MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.TEXT)) {
+        if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) {
-            if (!event.getAuthor().isBot()) {
+            String[] prefixes = {rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()), event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention()};
-                String[] prefixes = {rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()), event.getGuild().getSelfMember().getAsMention()+" ", event.getGuild().getSelfMember().getAsMention()};
+            for (String prefix : prefixes) {
-                for (String prefix : prefixes) {
+                if (event.getMessage().getContentRaw().startsWith(prefix)) {
-                    if (event.getMessage().getContentRaw().startsWith(prefix)) {
+                    handler.handle(event, rethink, prefix);
-                        handler.handle(event, rethink, prefix);
+                    return;
-                        return;
-                    }
                 }
             }
         }

src/main/java/com/bbn/hadder/listener/MentionListener.java

@@ -2,7 +2,6 @@ package com.bbn.hadder.listener;
 
 import com.bbn.hadder.Rethink;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -19,17 +18,15 @@ public class MentionListener extends ListenerAdapter {
 
     @Override
     public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.TEXT)) {
+        if (event.isFromType(ChannelType.TEXT) && event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) {
-            if (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) {
+            event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
+                    .setTitle("Hello I'm Hadder.")
-                        .setTitle("Hello I'm Hadder.")
+                    .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
-                        .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
+                    .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
-                        .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
+                    .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false)
-                        .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false)
+                    .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
-                        .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
+                    .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
-                        .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
+                    .build()).queue();
-                        .build()).queue();
-            }
         }
     }
 }

src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java

@@ -5,7 +5,6 @@ package com.bbn.hadder.listener;
  */
 
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.PrivateChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

src/main/java/com/bbn/hadder/listener/RulesListener.java

@@ -23,11 +23,9 @@ public class RulesListener extends ListenerAdapter {
             if (!event.getMember().getUser().isBot()) {
                 if (event.getReactionEmote().getEmoji().equals("✅")) {
                     event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
-                } else if (event.getReactionEmote().getEmoji().equals("❌")) {
+                } else if (event.getReactionEmote().getEmoji().equals("❌") && event.getGuild().getSelfMember().canInteract(event.getMember())) {
-                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
+                    event.getReaction().removeReaction().queue();
-                        event.getReaction().removeReaction().queue();
+                    event.getMember().kick().reason("Declined the rules");
-                        event.getMember().kick().reason("Declined the rules");
-                    }
                 }
             }
         }
@@ -36,10 +34,8 @@ public class RulesListener extends ListenerAdapter {
     @Override
     public void onMessageReactionRemove(MessageReactionRemoveEvent event) {
         if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) {
-            if (!event.getMember().getUser().isBot()) {
+            if (!event.getMember().getUser().isBot() && event.getReactionEmote().getEmoji().equals("✅")) {
-                if (event.getReactionEmote().getEmoji().equals("✅")) {
+                event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
-                    event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
-                }
             }
         }
     }

src/main/java/com/bbn/hadder/utils/BotList.java

@@ -27,6 +27,7 @@ public class BotList {
     private static String DiscordExtremeList = "https://discordextremelist.xyz/api/bot/637002314162372639";
     private static String DiscordBotReviews = "https://discordbotreviews.xyz/api/bot/637002314162372639/stats";
     private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats";
+    private static String BotListSpace = "https://api.botlist.space/v1/bots/:637002314162372639";
 
     private Config config;
 
@@ -179,7 +180,21 @@ public class BotList {
             } catch (IOException e) {
                 e.printStackTrace();
             }
+
+            // BotListSpace
+
+            Request botlistspace = new Request.Builder()
+                    .url(BotListSpace)
+                    .post(body)
+                    .addHeader("Authorization", config.getBotListSpaceToken())
+                    .build();
+
+            try {
+                new OkHttpClient().newCall(botlistspace).execute().close();
+                System.out.println("Successfully posted count to BotList.Space!");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }
-
 }