Fixed a lot of issues with backend (#41)

Switched from .env to json. Fixed an issue were buttons could not be used. Fixed some issues which caused commands to not work. That's it 🥳

Author: RealYusufIsmail

.gitignore

@@ -24,7 +24,6 @@ out/
 bin/
 !**/src/main/**/bin/
 !**/src/test/**/bin/
-*.env
 
 ### NetBeans ###
 /nbproject/private/
@@ -41,3 +40,10 @@ bin/
 codecov
 *.log
 gradle.properties
+
+### log ###
+*.log.gz
+
+### Security ###
+config.json
+*.env

README.md

@@ -31,27 +31,26 @@ To get started, you'll need to create a Discord bot account and get a token.
 
 ### Part 2
 Once you have added the bot to your server, you will need to create a .env file as seen here.
-```env
-TOKEN=
-GUILD_ID=
-OWNER_ID=
-AUDIT_LOG_CHANNEL_ID=
-//for the excutor default is 1.
-CORE_POOL_SIZE=
-DATABASE_NAME=programming_bot
-DB_USER=
-DB_PASSWORD=
-DB_URL=
-PORT_NUMBER=
-SERVER_NAME=
-//used for creating questions
-HELP_CHANNEL_ID=
-//Used to post the thread channels which are open
-ACTIVE_QUESTION_CHANNEL_ID=
-//the max amount of help threads that can be created in a day, default is 2
-ASK_LIMIT=
-//Used to inform you how many members there is in the server
-USER_AMOUNT_CHANNEL_ID=
+
+Where it says 11111111111 replace it with a long value
+```json
+{
+  "TOKEN": "YOUR_TOKEN_HERE",
+  "GUILD_ID": 11111111111,
+  "OWNER_ID": 11111111111,
+  "AUDIT_LOG_CHANNEL_ID": 11111111111,
+  "CORE_POOL_SIZE": 1,
+  "DATABASE_NAME": "YOUR_DATABASE_NAME_HERE",
+  "DB_USER": "YOUR_DB_USER_HERE",
+  "DB_PASSWORD": "YOUR_DB_PASSWORD_HERE",
+  "DB_URL": "YOUR_DB_URL_HERE",
+  "PORT_NUMBER": 8080,
+  "SERVER_NAME": "YOUR_SERVER_NAME_HERE",
+  "HELP_CHANNEL_ID": 11111111111,
+  "ACTIVE_QUESTION_CHANNEL_ID": 11111111111,
+  "ASK_LIMIT": 3,
+  "USER_AMOUNT_CHANNEL_ID": 11111111111
+}
 ```
 
 ### Part 3

build.gradle

@@ -50,7 +50,7 @@ dependencies {
     implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.0'
     //implementation group: 'uk.org.lidalia', name: 'sysout-over-slf4j', version: '1.0.2'
     //config
-    implementation group: 'io.github.yusufsdiscordbot', name: 'config', version: '1.0.4'
+    implementation group: 'io.github.realyusufismail', name: 'jconfig', version: '1.0.5'
     //database
     implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.1'
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.5.0'
@@ -149,8 +149,8 @@ jar {
 
 def props = new Properties()
 //if the file exists, load the properties
-if (file(".env").exists()) {
-    file(".env").withInputStream { props.load(it) }
+if (file("config.json").exists()) {
+    file("config.json").withInputStream { props.load(it) }
 }
 
 //create the build directory so no errors happen with the workflow

example.config.json

@@ -0,0 +1,17 @@
+{
+  "TOKEN": "YOUR_TOKEN_HERE",
+  "GUILD_ID": 11111111111,
+  "OWNER_ID": 11111111111,
+  "AUDIT_LOG_CHANNEL_ID": 11111111111,
+  "CORE_POOL_SIZE": 1,
+  "DATABASE_NAME": "YOUR_DATABASE_NAME_HERE",
+  "DB_USER": "YOUR_DB_USER_HERE",
+  "DB_PASSWORD": "YOUR_DB_PASSWORD_HERE",
+  "DB_URL": "YOUR_DB_URL_HERE",
+  "PORT_NUMBER": 8080,
+  "SERVER_NAME": "YOUR_SERVER_NAME_HERE",
+  "HELP_CHANNEL_ID": "YOUR_HELP_CHANNEL_ID_HERE",
+  "ACTIVE_QUESTION_CHANNEL_ID": 11111111111,
+  "ASK_LIMIT": 3,
+  "USER_AMOUNT_CHANNEL_ID": 11111111111
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/github/org/programming/Bot.java

@@ -27,7 +27,7 @@ public class Bot {
 
     public static void main(String[] args) throws Exception {
         try {
-            new ProgrammingBot(args);
+            new ProgrammingBot();
         } catch (Exception e) {
             logger.error("Failed to start bot", e);
             System.exit(1);

src/main/java/io/github/org/programming/backend/extension/MessageCommandExtender.java

@@ -19,33 +19,14 @@
 package io.github.org.programming.backend.extension;
 
 import io.github.org.programming.backend.builder.message.MessageCommand;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 import javax.annotation.Nonnull;
 
-public interface MessageCommandExtender {
+public abstract class MessageCommandExtender extends ListenerAdapter {
 
-    void onMessageContextInteraction(@Nonnull MessageContextInteractionEvent event);
+    public abstract void onMessageContext(@Nonnull MessageContextInteractionEvent event);
 
-    default void onButtonClick(ButtonInteractionEvent event) {
-
-    }
-
-    default void onModalInteraction(ModalInteractionEvent event) {
-
-    }
-
-    default void onCommandAutoComplete(@Nonnull CommandAutoCompleteInteractionEvent event) {
-
-    }
-
-    default void onSelectMenu(@Nonnull SelectMenuInteractionEvent event) {
-
-    }
-
-    MessageCommand build();
+    public abstract MessageCommand build();
 }

src/main/java/io/github/org/programming/backend/extension/SlashCommandExtender.java

@@ -19,35 +19,14 @@
 package io.github.org.programming.backend.extension;
 
 import io.github.org.programming.backend.builder.slash.SlashCommand;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
-
-public interface SlashCommandExtender {
+public abstract class SlashCommandExtender extends ListenerAdapter {
 
     // This method is called when the command is executed.
-    void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event);
-
-    default void onButtonClick(ButtonInteractionEvent event) {
-
-    }
-
-    default void onModalInteraction(ModalInteractionEvent event) {
-
-    }
-
-    default void onCommandAutoComplete(@Nonnull CommandAutoCompleteInteractionEvent event) {
-
-    }
-
-    default void onSelectMenu(@Nonnull SelectMenuInteractionEvent event) {
-
-    }
+    public abstract void onSlashCommand(@NotNull SlashCommandInteractionEvent event);
 
-    SlashCommand build();
+    public abstract SlashCommand build();
 }

src/main/java/io/github/org/programming/backend/extension/UserCommandExtender.java

@@ -19,34 +19,13 @@
 package io.github.org.programming.backend.extension;
 
 import io.github.org.programming.backend.builder.user.UserCommand;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
+public abstract class UserCommandExtender extends ListenerAdapter {
 
-public interface UserCommandExtender {
+    public abstract void onUserContext(@NotNull UserContextInteractionEvent event);
 
-    void onUserContextInteraction(@NotNull UserContextInteractionEvent event);
-
-    default void onButtonClick(ButtonInteractionEvent event) {
-
-    }
-
-    default void onModalInteraction(ModalInteractionEvent event) {
-
-    }
-
-    default void onCommandAutoComplete(@Nonnull CommandAutoCompleteInteractionEvent event) {
-
-    }
-
-    default void onSelectMenu(@Nonnull SelectMenuInteractionEvent event) {
-
-    }
-
-    UserCommand build();
+    public abstract UserCommand build();
 }

src/main/java/io/github/org/programming/backend/handler/MessageCommandHandler.java

@@ -21,11 +21,7 @@
 import io.github.org.programming.backend.extension.MessageCommandExtender;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
 import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -68,9 +64,8 @@ protected MessageCommandHandler(@NotNull JDA jda, @NotNull Guild guild) {
      */
     @SuppressWarnings("ResultOfMethodCallIgnored")
     private void addMessageCommand(@NotNull MessageCommandExtender command) {
-
         BaseHandler.checkIfBuildIsNull(command.build(), command.getClass().getSimpleName());
-
+        jda.addEventListener(command);
         messageCommand.put(command.build().getCommandData().getName(), command);
         if (command.build().isGuildOnly()) {
             guildCommandsData.addCommands(command.build().getCommandData());
@@ -136,35 +131,10 @@ public void onMessageContextInteraction(@Nonnull MessageContextInteractionEvent
                 && !event.getGuild().getSelfMember().hasPermission(cmd.build().getBotPerms())) {
             event.reply("I do not have permission to use this command.").setEphemeral(true).queue();
         } else {
-            cmd.onMessageContextInteraction(event);
+            cmd.onMessageContext(event);
         }
     }
 
-    @Override
-    public void onButtonInteraction(@Nonnull ButtonInteractionEvent event) {
-        final MessageCommandExtender cmd = messageCommand.get(event.getComponentId());
-        cmd.onButtonClick(event);
-    }
-
-    @Override
-    public void onSelectMenuInteraction(@Nonnull SelectMenuInteractionEvent event) {
-        final MessageCommandExtender cmd = messageCommand.get(event.getComponentId());
-        cmd.onSelectMenu(event);
-    }
-
-    @Override
-    public void onCommandAutoCompleteInteraction(
-            @Nonnull CommandAutoCompleteInteractionEvent event) {
-        final MessageCommandExtender cmd = messageCommand.get(event.getName());
-        cmd.onCommandAutoComplete(event);
-    }
-
-    @Override
-    public void onModalInteraction(@Nonnull ModalInteractionEvent event) {
-        final MessageCommandExtender cmd = messageCommand.get(event.getModalId());
-        cmd.onModalInteraction(event);
-    }
-
     /**
      * Gets slash commands as a list.
      *