big refacto

Author: FunixG

Core/src/main/java/fr/funixgaming/funixbot/core/config/FeignConfiguration.java

@@ -0,0 +1,13 @@
+package fr.funixgaming.funixbot.core.config;
+
+import feign.okhttp.OkHttpClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FeignConfiguration {
+    @Bean
+    public OkHttpClient client() {
+        return new OkHttpClient();
+    }
+}

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/FunixBot.java

@@ -1,6 +1,5 @@
 package fr.funixgaming.funixbot.discord;
 
-import fr.funixgaming.api.client.external_api_impl.twitch.reference.dtos.responses.channel.stream.TwitchStreamDTO;
 import fr.funixgaming.funixbot.core.exceptions.FunixBotException;
 import fr.funixgaming.funixbot.discord.configs.BotConfig;
 import fr.funixgaming.funixbot.discord.modules.BotEmotes;
@@ -14,7 +13,6 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import org.springframework.stereotype.Service;
 
-
 @Slf4j
 @Getter
 @Service
@@ -25,8 +23,6 @@ public class FunixBot {
     private final BotRoles botRoles;
     private final Guild botGuild;
 
-    private TwitchStreamDTO funixStreamStatus = null;
-
     public FunixBot(BotConfig botConfig, JDA jda) throws Exception {
         try {
             this.jda = jda;

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/configs/BotConfig.java

@@ -1,8 +1,5 @@
 package fr.funixgaming.funixbot.discord.configs;
 
-import fr.funixgaming.funixbot.discord.events.BotGuildEvents;
-import fr.funixgaming.funixbot.discord.events.BotMessagesEvents;
-import fr.funixgaming.funixbot.discord.events.BotSlashCommandsEvents;
 import lombok.Getter;
 import lombok.Setter;
 import net.dv8tion.jda.api.JDA;
@@ -46,20 +43,12 @@ public class BotConfig {
     private String tiktokNotifRoleId;
 
     @Bean(destroyMethod = "shutdown")
-    public JDA discordInstance(BotMessagesEvents botMessagesEvents,
-                               BotSlashCommandsEvents slashCommandsEvents,
-                               BotGuildEvents botGuildEvents) {
+    public JDA discordInstance() {
         try {
             final JDABuilder jdaBuilder = JDABuilder.createDefault(botToken);
 
             jdaBuilder.enableIntents(GatewayIntent.GUILD_MEMBERS);
 
-            jdaBuilder.addEventListeners(
-                    botMessagesEvents,
-                    slashCommandsEvents,
-                    botGuildEvents
-            );
-
             jdaBuilder.setActivity(Activity.of(
                     Activity.ActivityType.WATCHING,
                     String.format("twitch.tv/%s", streamerUsername),

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/configs/JdaEventsConfig.java

@@ -0,0 +1,50 @@
+package fr.funixgaming.funixbot.discord.configs;
+
+import fr.funixgaming.funixbot.discord.FunixBot;
+import fr.funixgaming.funixbot.discord.events.BotGuildEvents;
+import fr.funixgaming.funixbot.discord.events.BotMessagesEvents;
+import fr.funixgaming.funixbot.discord.events.BotSlashCommandsEvents;
+import fr.funixgaming.funixbot.discord.modules.RoleMessageHandler;
+import net.dv8tion.jda.api.JDA;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class JdaEventsConfig {
+
+    @Bean
+    public RoleMessageHandler roleMessageHandler(BotConfigGenerated botConfigGenerated,
+                                                 FunixBot funixBot,
+                                                 JDA jda) {
+        return new RoleMessageHandler(botConfigGenerated, funixBot, jda);
+    }
+
+    @Bean
+    public BotMessagesEvents botMessagesEvents(RoleMessageHandler roleMessageHandler,
+                                               JDA jda) {
+        final BotMessagesEvents messagesEvents = new BotMessagesEvents(roleMessageHandler);
+
+        jda.addEventListener(messagesEvents);
+        return messagesEvents;
+    }
+
+    @Bean
+    public BotGuildEvents botGuildEvents(FunixBot funixBot,
+                                         BotConfig botConfig,
+                                         JDA jda) {
+        final BotGuildEvents botGuildEvents = new BotGuildEvents(botConfig, funixBot);
+
+        jda.addEventListener(botGuildEvents);
+        return botGuildEvents;
+    }
+
+    @Bean
+    public BotSlashCommandsEvents botSlashCommandsEvents(FunixBot funixBot,
+                                                         JDA jda) {
+        final BotSlashCommandsEvents botSlashCommandsEvents = new BotSlashCommandsEvents(funixBot);
+
+        jda.addEventListener(botSlashCommandsEvents);
+        return botSlashCommandsEvents;
+    }
+
+}

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/events/BotGuildEvents.java

@@ -14,13 +14,11 @@
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 
 import java.awt.*;
 import java.time.format.DateTimeFormatter;
 
 @Slf4j
-@Component
 @AllArgsConstructor
 public class BotGuildEvents extends ListenerAdapter {
 

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/events/BotMessagesEvents.java

@@ -13,10 +13,8 @@
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 
 @Slf4j
-@Component
 @RequiredArgsConstructor
 public class BotMessagesEvents extends ListenerAdapter {
 

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/events/BotSlashCommandsEvents.java

@@ -1,13 +1,16 @@
 package fr.funixgaming.funixbot.discord.events;
 
+import fr.funixgaming.funixbot.discord.FunixBot;
+import lombok.RequiredArgsConstructor;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 
-@Component
+@RequiredArgsConstructor
 public class BotSlashCommandsEvents extends ListenerAdapter {
 
+    private final FunixBot funixBot;
+
     @Override
     public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
     }

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/modules/RoleMessageHandler.java

@@ -3,33 +3,27 @@
 import fr.funixgaming.funixbot.core.exceptions.FunixBotException;
 import fr.funixgaming.funixbot.core.utils.BotColors;
 import fr.funixgaming.funixbot.discord.FunixBot;
-import fr.funixgaming.funixbot.discord.configs.BotConfig;
 import fr.funixgaming.funixbot.discord.configs.BotConfigGenerated;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import net.dv8tion.jda.api.requests.ErrorResponse;
-import org.springframework.stereotype.Component;
 
 @Slf4j
-@Component
 public class RoleMessageHandler {
 
     private final BotConfigGenerated botConfigGenerated;
-    private final BotConfig botConfig;
-    private final JDA jda;
     private final FunixBot funixBot;
+    private final JDA jda;
 
     public RoleMessageHandler(BotConfigGenerated botConfigGenerated,
-                              BotConfig botConfig,
-                              JDA jda,
-                              FunixBot funixBot) {
+                              FunixBot funixBot,
+                              JDA jda) {
         this.botConfigGenerated = botConfigGenerated;
-        this.botConfig = botConfig;
-        this.jda = jda;
         this.funixBot = funixBot;
+        this.jda = jda;
 
         try {
             setMessageRoleChoice();
@@ -39,7 +33,7 @@ public RoleMessageHandler(BotConfigGenerated botConfigGenerated,
     }
 
     private void setMessageRoleChoice() throws FunixBotException {
-        final TextChannel rolesChannel = jda.getTextChannelById(botConfig.getRolesChannelId());
+        final TextChannel rolesChannel = jda.getTextChannelById(funixBot.getBotConfig().getRolesChannelId());
 
         if (rolesChannel == null) {
             throw new FunixBotException("Le channel pour le choix des rôles n'existe pas.");

FunixBot-Discord/src/main/java/fr/funixgaming/funixbot/discord/modules/TwitchStreamNotifications.java

@@ -59,9 +59,7 @@ private void sendNotification(@NonNull final TwitchStreamDTO stream) {
         String gameBoxArtUrl = null;
 
         if (game != null) {
-            gameBoxArtUrl = game.getBoxArtUrl();
-            gameBoxArtUrl = gameBoxArtUrl.replace("{width}", "600");
-            gameBoxArtUrl = gameBoxArtUrl.replace("{height}", "840");
+            gameBoxArtUrl = game.getBoxArtUrl(600, 840);
         }
 
         final EmbedBuilder embedBuilder = new EmbedBuilder()

FunixBot-Twitch/src/test/java/fr/funixgaming/funixbot/twitch/modules/AutoMessageTest.java

@@ -1,18 +1,11 @@
 package fr.funixgaming.funixbot.twitch.modules;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@SpringBootTest
 public class AutoMessageTest {
 
-    @Autowired
     private AutoMessages autoMessages;
 
-    @Test
     public void testGettingJson() {
         System.out.println(autoMessages.getMessages().length + " messages");
         assertEquals(4, autoMessages.getMessages().length);