.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: BBN Holding Discord Support
+  - name: BigBotNetwork Discord Support
     url: https://discord.gg/nPwjaJk
     about: Please ask questions here.

.github/dependabot.yml

@@ -1,13 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "13:00"
-  open-pull-requests-limit: 99
-  target-branch: greg-dev
-  assignees:
-  - GregTCLTK
-  labels:
-  - pending-deploy

README.md

@@ -3,13 +3,13 @@
 Hadder Discord is a multi-purpose Discord bot with 100% uptime.
 
 <a href="https://discord.gg/nPwjaJk"><img src="https://discord.com/api/guilds/757966278936756345/embed.png"/></a>
-[![Build Status](https://github.com/BBN-Holding/Hadder/workflows/Hadder/badge.svg)](https://github.com/BBN-Holding/Hadder)
+[![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/BBN-Holding/Hadder?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=BBN-Holding/Hadder&amp;utm_campaign=Badge_Grade)
+[![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)
 [![CodeFactor](https://www.codefactor.io/repository/github/bigbotnetwork/hadder/badge)](https://www.codefactor.io/repository/github/bigbotnetwork/hadder)
 [![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder)
-[![GitHub issues](https://img.shields.io/github/issues/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/issues)
+[![GitHub issues](https://img.shields.io/github/issues/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/issues)
-[![GitHub license](https://img.shields.io/github/license/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/blob/master/LICENSE)
+[![GitHub license](https://img.shields.io/github/license/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/blob/master/LICENSE)
-[![time tracker](https://wakatime.com/badge/github/BBN-Holding/Hadder.svg)](https://wakatime.com/badge/github/BBN-Holding/Hadder)
+[![time tracker](https://wakatime.com/badge/github/BigBotNetwork/Hadder.svg)](https://wakatime.com/badge/github/BigBotNetwork/Hadder)
 
 ## Hadder Team
 ### Developer

pom.xml

@@ -6,11 +6,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>Hadder</groupId>
     <artifactId>Hadder</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.0</version>
     <name>Hadder</name>
     <inceptionYear>2019</inceptionYear>
     <description>Hadder is a multi-purpose Discord bot.</description>
-    <url>https://github.com/BBN-Holding/Hadder</url>
+    <url>https://github.com/BigBotNetwork/Hadder</url>
 
     <licenses>
         <license>
@@ -58,61 +58,106 @@
             <name>jcenter-bintray</name>
             <url>https://jcenter.bintray.com</url>
         </repository>
-        <repository>
-            <id>dv8tion</id>
-            <name>m2-dv8tion</name>
-            <url>https://m2.dv8tion.net/releases</url>
-        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>3.8.6</version>
+            <version>3.6.3</version>
         </dependency>
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.4.0_352</version>
+            <version>4.2.0_247</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20220924</version>
+            <version>20210307</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.3</version>
+            <version>1.7.30</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>discord-webhooks</artifactId>
-            <version>0.8.2</version>
+            <version>0.5.6</version>
         </dependency>
         <dependency>
             <groupId>org.kohsuke</groupId>
             <artifactId>github-api</artifactId>
-            <version>1.313</version>
+            <version>1.125</version>
         </dependency>
         <dependency>
             <groupId>com.sedmelluq</groupId>
             <artifactId>lavaplayer</artifactId>
-            <version>1.3.78</version>
+            <version>1.3.73</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.12.2</version>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver-sync</artifactId>
-            <version>4.7.1</version>
+            <version>4.2.2</version>
         </dependency>
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <configuration>
+                        <finalName>Hadder-Build</finalName>
+                        <archive>
+                            <manifest>
+                                <mainClass>one.bbn.hadder.Hadder</mainClass>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.5.2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.9.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>15</source>
                     <target>15</target>

src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java

@@ -47,7 +47,7 @@ public class FeedbackCommand implements Command {
                 String description = e2.getMessage().getContentDisplay();
                 try {
                     GitHub connection = GitHub.connectUsingOAuth(e.getConfig().getGitHubToken());
-                    GHRepository Hadder = connection.getOrganization("BBN-Holding").getRepository("Hadder");
+                    GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder");
                     GHIssue issue = Hadder.createIssue(title).body("<strong>Feedback by " + e.getAuthor().getAsTag() + "</strong><br>" + description).label("feedback").create();
                     issue.addLabels("feedback");
                     e.getTextChannel().sendMessage(

src/main/java/one/bbn/hadder/commands/music/VolumeCommand.java

@@ -19,7 +19,7 @@ package one.bbn.hadder.commands.music;
 import one.bbn.hadder.commands.Command;
 import one.bbn.hadder.commands.CommandEvent;
 import one.bbn.hadder.utils.MessageEditor;
-import org.codehaus.plexus.util.StringUtils;
+import org.jsoup.internal.StringUtil;
 
 public class VolumeCommand implements Command {
 
@@ -28,7 +28,7 @@ public class VolumeCommand implements Command {
         if (args.length > 0) {
             if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) {
                 if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
-                    if (StringUtils.isNumeric(args[0])) {
+                    if (StringUtil.isNumeric(args[0])) {
                         int volume = Integer.parseInt(args[0]);
                         if (volume < 201 && volume > 0 || e.getConfig().getOwners().contains(e.getAuthor().getIdLong())) {
                             e.getAudioManager().getPlayer(e.getGuild()).setVolume(volume);

src/main/java/one/bbn/hadder/db/Mongo.java

@@ -43,11 +43,7 @@ public class Mongo {
         BasicDBObject whereQuery = new BasicDBObject();
         whereQuery.put(where, what);
         FindIterable<Document> it = collection.find(whereQuery);
-        try {
+        return it.cursor().next().get(column);
-            return it.cursor().next().get(column);
-        } catch (NoSuchElementException ignore) {
-            return null;
-        }
     }
 
     public JSONObject getObjectByID(String collection, String id) {
@@ -57,10 +53,7 @@ public class Mongo {
             String response = db.getCollection(collection).find(whereQuery).cursor().next().toJson();
             return new JSONObject(response);
         } catch (NoSuchElementException e) {
-            if (collection.equals("user"))
+            insertUser(id);
-                insertUser(id);
-            else if (collection.equals("server"))
-                insertGuild(id);
             String response2 = db.getCollection(collection).find(whereQuery).cursor().next().toJson();
             return new JSONObject(response2);
         }
@@ -137,7 +130,8 @@ public class Mongo {
     }
 
     public boolean hasStarboardMessage(String message_id) {
-        return this.getByID("stars", "id", message_id, "guild") != null;
+        this.getByID("stars", "id", message_id, "guild");
+        return true;
     }
 
     public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {

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

@@ -78,16 +78,13 @@ public class CommandListener extends ListenerAdapter {
                     }
                 }
             } else {
-                try {
+                e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder()
-                    e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder()
+                        .setTitle("No permission")
-                            .setTitle("No permission")
+                        .setDescription("I need the `MESSAGE WRITE` permission in order to work!")
-                            .setDescription("I need the `MESSAGE WRITE` permission in order to work!")
+                        .setColor(Color.RED)
-                            .setColor(Color.RED)
+                        .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
-                            .setFooter("Hadder", "https://bbn.one/images/Hadder.png")
+                        .setTimestamp(Instant.now())
-                            .setTimestamp(Instant.now())
+                        .build()).queue();
-                            .build()).queue();
-                } catch (ErrorResponseException ignore) {}
-
             }
         }
     }

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

@@ -53,7 +53,7 @@ public class MentionListener extends ListenerAdapter {
 
                 try {
                     GitHub connection = GitHub.connectUsingOAuth(config.getGitHubToken());
-                    GHRepository Hadder = connection.getOrganization("BBN-Holding").getRepository("Hadder");
+                    GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder");
                     version = Hadder.getLatestRelease().getTagName();
                 } catch (IOException ioException) {
                     ioException.printStackTrace();
@@ -65,7 +65,8 @@ public class MentionListener extends ListenerAdapter {
                         .addField("User-Prefix", mongoUser.getPrefix(), true)
                         .addField("Guild-Prefix", mongoServer.getPrefix(), true)
                         .addField("Join our Dev Server!", "[Click here!](https://discord.gg/nPwjaJk)", true)
-                        .addField("Github", "[Click here!](https://github.com/BBN-Holding/Hadder)", false);
+                        .addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)", false)
+                        .addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false);
                 e.getChannel().sendMessage(builder.build()).queue();
             } else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
                 int member = new Random().nextInt(e.getGuild().getMembers().size() - 1);