awesome

.gitignore

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

README.md

@@ -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/).

build.gradle.kts

@@ -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)
+    }
+}

settings.gradle.kts

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

src/main/java/com/diamondfire/helpbot/HelpBot.java

@@ -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 {
 

src/main/java/com/diamondfire/helpbot/bot/HelpBotInstance.java

@@ -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;
     }

src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/MojangPlayerUUIDArgument.java

@@ -1,14 +1,10 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.AbstractSimpleValueArgument;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.util.Util;
+import com.diamondfire.helpbot.util.*;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import okhttp3.Request;
-import okhttp3.ResponseBody;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -23,16 +19,9 @@ protected UUID parse(@NotNull String argument, CommandEvent event) throws Argume
            return Util.toUuid(argument);
         } else {
             JsonObject responseObject = null;
-            ResponseBody res = null;
-            Request request = new Request.Builder().url("https://api.mojang.com/users/profiles/minecraft/" + argument).get().build();
-            try {
-                res = HelpBotInstance.getHttpClient().newCall(request).execute().body();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
 
             try {
-                responseObject = JsonParser.parseString(res.string()).getAsJsonObject();
+                responseObject = WebUtil.getJson("https://api.mojang.com/users/profiles/minecraft/" + argument).getAsJsonObject();
             } catch (IOException e) {
                 e.printStackTrace();
             }

src/main/java/com/diamondfire/helpbot/bot/command/disable/DisableCommandHandler.java

@@ -48,6 +48,9 @@ public void enable(Command command) {
     }
 
     public void disable(Command command) {
+        if (command == null) {
+            return;
+        }
         // Prevents tricky people using eval.
         if (command instanceof CommandDisableFlag) {
             return;

src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/AbstractSingleQueryCommand.java

@@ -13,7 +13,10 @@
 import com.diamondfire.helpbot.sys.interaction.button.ButtonHandler;
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.interactions.components.Button;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.interactions.components.buttons.Button;
 
 import java.util.*;
 import java.util.function.BiConsumer;
@@ -22,7 +25,7 @@
 
 public abstract class AbstractSingleQueryCommand extends Command {
 
-    public static void sendMultipleMessage(List<CodeObject> actions, TextChannel channel, long userToWait, BiConsumer<CodeObject, TextChannel> onChosen) {
+    public static void sendMultipleMessage(List<CodeObject> actions, GuildMessageChannel channel, long userToWait, BiConsumer<CodeObject, GuildMessageChannel> onChosen) {
         // This here is to determine if all the duplicate types are the same. If not, we need to make sure that we filter those out first..
         CodeObject referenceData = actions.get(0);
         Class<? extends CodeObject> classReference = referenceData.getClass();
@@ -46,26 +49,26 @@ public static void sendMultipleMessage(List<CodeObject> actions, TextChannel cha
             for (Map.Entry<BasicReaction, CodeObject> reaction : referenceData.getEnum().getEmbedBuilder().generateDupeEmojis(actions).entrySet()) {
                 Button button = Button.secondary(reaction.getKey().toString(), reaction.getValue().getName());
 
-                buttons.add(button.withEmoji(Emoji.fromEmote(reaction.getKey().getEmote())));
+                buttons.add(button.withEmoji(Emoji.fromCustom(reaction.getKey().getEmote())));
                 buttonMap.put(button.getId(), reaction.getValue());
             }
         } else {
             for (CodeObject data : actions) {
                 long emoji = data.getEnum().getEmoji();
                 Button button = Button.secondary(String.valueOf(data.getEnum().getEmoji()), data.getName());
 
-                buttons.add(button.withEmoji(Emoji.fromEmote(HelpBotInstance.getJda().getEmoteById(emoji))));
+                buttons.add(button.withEmoji(HelpBotInstance.getJda().getEmojiById(emoji)));
                 buttonMap.put(button.getId(), data);
             }
         }
 
-        channel.sendMessageEmbeds(preset.getEmbed().build()).setActionRows(Util.of(buttons)).queue((message) -> {
+        channel.sendMessageEmbeds(preset.getEmbed().build()).setActionRow(buttons).queue((message) -> {
             ButtonHandler.addListener(userToWait, message, (event) -> {
                 message.delete().queue();
 
                 // when msg is deleted causes nullpointer when tries to remove reactions! FIX
                 CodeObject object = buttonMap.get(event.getComponentId());
-                onChosen.accept(object, message.getTextChannel());
+                onChosen.accept(object, message.getChannel().asGuildMessageChannel());
             });
         });
 
@@ -83,9 +86,9 @@ public void run(CommandEvent event) {
         getData(event, onDataReceived());
     }
 
-    public abstract BiConsumer<CodeObject, TextChannel> onDataReceived();
+    public abstract BiConsumer<CodeObject, GuildMessageChannel> onDataReceived();
 
-    protected void getData(CommandEvent event, BiConsumer<CodeObject, TextChannel> onChosen) {
+    protected void getData(CommandEvent event, BiConsumer<CodeObject, GuildMessageChannel> onChosen) {
         String name = event.getArgument("name");
         PresetBuilder preset = new PresetBuilder();
 
@@ -118,9 +121,9 @@ protected void getData(CommandEvent event, BiConsumer<CodeObject, TextChannel> o
 
                 // If none, proceed. Else we need to special case that.
                 if (sameActions.size() == 1) {
-                    onChosen.accept(sameActions.get(0), event.getChannel());
+                    onChosen.accept(sameActions.get(0), event.getChannel().asGuildMessageChannel());
                 } else if (sameActions.size() > 1) {
-                    sendMultipleMessage(sameActions, event.getChannel(), event.getMember().getIdLong(), onChosen);
+                    sendMultipleMessage(sameActions, event.getChannel().asGuildMessageChannel(), event.getMember().getIdLong(), onChosen);
                 }
 
                 return;

src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/CodeCommand.java

@@ -6,22 +6,24 @@
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.datatypes.CodeObject;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.io.File;
 import java.util.function.BiConsumer;
 
 
 public class CodeCommand extends AbstractSingleQueryCommand {
 
-    public static <T extends CodeObject> void sendHelpMessage(T data, TextChannel channel) {
+    public static <T extends CodeObject> void sendHelpMessage(T data, GuildMessageChannel channel) {
         EmbedBuilder builder = data.getEnum().getEmbedBuilder().generateEmbed(data);
         String customHead = data.getItem().getHead();
 
         if (customHead == null) {
             File actionIcon = Util.fetchMinecraftTextureFile(data.getItem().getMaterial().toUpperCase());
             builder.setThumbnail("attachment://" + actionIcon.getName());
-            channel.sendMessageEmbeds(builder.build()).addFile(actionIcon).queue();
+            channel.sendMessageEmbeds(builder.build()).addFiles(FileUpload.fromData(actionIcon)).queue();
         } else {
             builder.setThumbnail(customHead);
             channel.sendMessageEmbeds(builder.build()).queue();
@@ -56,7 +58,7 @@ public void run(CommandEvent event) {
     }
 
     @Override
-    public BiConsumer<CodeObject, TextChannel> onDataReceived() {
+    public BiConsumer<CodeObject, GuildMessageChannel> onDataReceived() {
         return CodeCommand::sendHelpMessage;
     }
 }