Merge pull request #4 from MCDiamondFire/master

awesome

Author: ProjectDF

.editorconfig

@@ -5,5 +5,4 @@ build
 /src/main/resources/swear_filter.json
 
 *.json
-*.png
 *.txt

.gitignore

@@ -61,3 +61,13 @@ After setting up the config, you will need to paste the following into the swear
   ]
 }
 ```
+
+## Special Thanks To
+
+![YourKit Logo](https://www.yourkit.com/images/yklogo.png)
+
+YourKit supports open source projects with innovative and intelligent tools
+for monitoring and profiling Java and .NET applications.
+YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/),
+[YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),
+and [YourKit YouMonitor](ttps://www.yourkit.com/youmonitor/).

README.md

@@ -0,0 +1,49 @@
+plugins {
+    java
+    application
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+}
+
+application {
+    mainClass.set("com.diamondfire.helpbot.HelpBot")
+}
+
+group = "com.diamondfire.helpbot"
+
+repositories {
+    mavenCentral()
+    maven(url = "https://jitpack.io")
+    maven(url = "https://m2.dv8tion.net/releases")
+}
+
+dependencies {
+    implementation ("net.dv8tion:JDA:5.0.0-beta.20") {
+        exclude(module = "opus-java")
+    }
+
+    implementation("club.minnced:discord-webhooks:0.5.8")
+    implementation("ch.qos.logback:logback-classic:1.2.5")
+    implementation("com.google.code.gson:gson:2.8.6")
+    implementation ("com.github.Steveice10:MCProtocolLib:c5e4b66")
+    implementation("mysql:mysql-connector-java:5.1.13")
+    implementation("org.codehaus.groovy:groovy-jsr223:3.0.8")
+    implementation("net.kyori:adventure-api:4.16.0")
+    implementation("net.kyori:adventure-text-minimessage:4.16.0")
+    implementation("dev.vankka:mcdiscordreserializer:4.3.0")
+}
+
+tasks {
+    compileJava {
+        options.encoding = "UTF-8"
+    }
+
+    jar {
+        manifest {
+            attributes["Main-Class"] = "com.diamondfire.helpbot.HelpBot"
+        }
+    }
+
+    build {
+        dependsOn(shadowJar)
+    }
+}

build.gradle

@@ -0,0 +1,2 @@
+rootProject.name = "DFHelpBot"
+

build.gradle.kts

@@ -1,13 +1,10 @@
 package com.diamondfire.helpbot;
 
-
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.changelog.CodeDifferenceHandler;
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.CodeDatabase;
-import com.diamondfire.helpbot.sys.tag.TagHandler;
 
 import javax.security.auth.login.LoginException;
-import java.io.IOException;
 
 public class HelpBot {
 

gradlew

@@ -20,6 +20,7 @@
 import com.diamondfire.helpbot.bot.config.Config;
 import com.diamondfire.helpbot.bot.events.*;
 import com.diamondfire.helpbot.sys.tasks.TaskRegistry;
+import com.google.gson.Gson;
 import net.dv8tion.jda.api.*;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.requests.GatewayIntent;
@@ -31,10 +32,11 @@
 
 public class HelpBotInstance {
 
+    public static final Gson GSON = new Gson();
+    
     private static final Config config = new Config();
     public static final long DF_GUILD = config.getGuild();
     public static final long LOG_CHANNEL = config.getLogChannel();
-    public static final OkHttpClient HTTP_CLIENT = new OkHttpClient();
 
     private static JDA jda;
     private static final TaskRegistry loop = new TaskRegistry();
@@ -49,12 +51,13 @@ public static void initialize() throws LoginException {
                 new SearchCommand(),
                 new TagsCommand(),
                 // others
-                new CowsayCommand(),
+                //new CowsayCommand(),
                 new MimicCommand(),
-                new FetchDataCommand(),
+                new SolvedCommand(),
+                //new FetchDataCommand(),
                 new InfoCommand(),
                 new EvalCommand(),
-                new GarfieldCommand(),
+                //new GarfieldCommand(),
                 new HelpCommand(),
                 new RestartCommand(),
                 new ActionDumpCommand(),
@@ -75,10 +78,10 @@ public static void initialize() throws LoginException {
                 new MutedCommand(),
                 new UnmuteCommand(),
                 new VerifyCommand(),
-                new PollCommand(),
+                // new PollCommand(), - Unused
                 new IdeaCommand(),
-                new StoreCommand(),
-                new ChannelMuteCommand(),
+                // new StoreCommand(),
+                // new ChannelMuteCommand(), - not finished
                 // statsbot
                 new StatsCommand(),
                 new SupportBadCommand(),
@@ -104,7 +107,7 @@ public static void initialize() throws LoginException {
                 new QueueCommand(),
                 new WhoHelpedCommand(),
                 new HelpedByCommand(),
-                new NamesCommand(),
+                // new NamesCommand(), - Dead
                 new PlayerJoinGraphCommand(),
                 //new CpCommand(),
                 //new CpRequirementsCommand(),
@@ -122,24 +125,23 @@ public static void initialize() throws LoginException {
                 new ExcuseStaffCommand(),
                 new ExcusedStaffCommand(),
                 new SupportBannedPlayersCommand(),
-                new DiscussionMuteCommand(),
                 new NbsCommand(),
                 new DailySessionsCommand(),
                 new EightBallCommand(),
-                new OcrCommand(),
+                // new OcrCommand(), - Dead
                 new JoinsCommand(),
                 new TagCommand(),
                 new PurgeCommand()
         );
 
         JDABuilder builder = JDABuilder.createDefault(config.getToken())
-                .enableIntents(GatewayIntent.GUILD_MEMBERS)
+                .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT, GatewayIntent.DIRECT_MESSAGES, GatewayIntent.DIRECT_MESSAGE_REACTIONS)
                 .setStatus(OnlineStatus.ONLINE)
                 .setMemberCachePolicy(MemberCachePolicy.NONE)
                 .setActivity(Activity.watching("for " + getConfig().getPrefix() + "help"))
                 .setGatewayEncoding(GatewayEncoding.ETF)
                 .disableCache(CacheFlag.ACTIVITY, CacheFlag.VOICE_STATE, CacheFlag.CLIENT_STATUS)
-                .addEventListeners(new MessageEvent(), new ReadyEvent(), new GuildJoinEvent(), new ButtonEvent(), new MessageEditEvent());
+                .addEventListeners(new MessageEvent(), new ReadyEvent(), new GuildJoinEvent(), new ButtonEvent(), new MessageEditEvent(), new PostAppliedTagsEvent(), new ChannelCreatedEvent(), new ChannelArchiveEvent());
 
         jda = builder.build();
         CommandHandler.getInstance().initialize();
@@ -149,10 +151,6 @@ public static JDA getJda() {
         return jda;
     }
 
-    public static OkHttpClient getHttpClient() {
-        return HTTP_CLIENT;
-    }
-    
     public static Config getConfig() {
         return config;
     }