Merge pull request #70 from beanbeanjuice/integration

Ready for Version 1.1.4
beanbeanjuice · May 8, 2021 · 59d132b · 59d132b
2 parents cb55e37 + a08e1f8
commit 59d132b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ task buildWithDependencies(type: Jar) {
 
 group 'com.beanbeanjuice'
 mainClassName = 'com.beanbeanjuice.main.BeanBot'
-version 'v1.1.3'
+version 'v1.1.4'
 
 repositories {
 

diff --git a/src/main/java/com/beanbeanjuice/utility/guild/CustomGuild.java b/src/main/java/com/beanbeanjuice/utility/guild/CustomGuild.java
@@ -3,7 +3,6 @@
 import com.beanbeanjuice.main.BeanBot;
 import com.beanbeanjuice.utility.lavaplayer.GuildMusicManager;
 import com.beanbeanjuice.utility.lavaplayer.PlayerManager;
-import com.beanbeanjuice.utility.logger.LogLevel;
 import com.beanbeanjuice.utility.twitch.Twitch;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.*;
@@ -48,12 +47,22 @@ public CustomGuild(@NotNull String guildID, @NotNull String prefix, @NotNull Str
         this.twitchChannels = twitchChannels;
         this.mutedRoleID = mutedRoleID;
 
+        // Checks if a Listener has already been created for that guild.
+        // This is so that if the cache is reloaded, it does not need to recreate the Listeners.
         if (BeanBot.getTwitchHandler().getTwitch(guildID) == null) {
-            BeanBot.getTwitchHandler().addTwitchToGuild(guildID, new Twitch(this.guildID, this.liveChannelID, this.twitchChannels));
+            BeanBot.getTwitchHandler().addTwitchToGuild(guildID, new Twitch(this.guildID, this.twitchChannels));
         }
 
     }
 
+    /**
+     * @return The {@link String} ID of the live channel to send messages.
+     */
+    @NotNull
+    public String getLiveChannelID() {
+        return liveChannelID;
+    }
+
     /**
      * Sets the last channel the music commands were sent in.
      * @param lastMusicChannel The {@link TextChannel} of the last music command.

diff --git a/src/main/java/com/beanbeanjuice/utility/twitch/Twitch.java b/src/main/java/com/beanbeanjuice/utility/twitch/Twitch.java
@@ -19,14 +19,13 @@ public class Twitch {
     /**
      * Creates a new {@link Twitch} instance.
      * @param guildID The ID of the {@link Guild}.
-     * @param liveChannelID The ID of the {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}.
      * @param twitchChannels The {@link ArrayList<String>} of Twitch Channels.
      */
-    public Twitch(@NotNull String guildID, @NotNull String liveChannelID, @NotNull ArrayList<String> twitchChannels) {
+    public Twitch(@NotNull String guildID, @NotNull ArrayList<String> twitchChannels) {
         twitchListener = new TwitchListener();
         twitchChannelNamesHandler = new TwitchChannelNamesHandler(this);
 
-        twitchListener.addEventHandler(new TwitchMessageEventHandler(guildID, liveChannelID));
+        twitchListener.addEventHandler(new TwitchMessageEventHandler(guildID));
 
         if (!twitchChannels.isEmpty()) {
             for (String channel : twitchChannels) {

diff --git a/src/main/java/com/beanbeanjuice/utility/twitch/TwitchMessageEventHandler.java b/src/main/java/com/beanbeanjuice/utility/twitch/TwitchMessageEventHandler.java
@@ -1,7 +1,6 @@
 package com.beanbeanjuice.utility.twitch;
 
 import com.beanbeanjuice.main.BeanBot;
-import com.beanbeanjuice.utility.logger.LogLevel;
 import com.github.philippheuer.events4j.simple.SimpleEventHandler;
 import com.github.philippheuer.events4j.simple.domain.EventSubscriber;
 import com.github.twitch4j.events.ChannelGoLiveEvent;
@@ -21,26 +20,21 @@
 public class TwitchMessageEventHandler extends SimpleEventHandler {
 
     private String guildID;
-    private String liveChannelID;
 
     /**
      * Creates a new {@link TwitchMessageEventHandler} object.
      * @param guildID The ID of the {@link Guild} for the message to be sent in.
-     * @param liveChannelID The ID of the {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} for the message to be sent in.
      */
-    public TwitchMessageEventHandler(@NotNull String guildID, @NotNull String liveChannelID) {
+    public TwitchMessageEventHandler(@NotNull String guildID) {
         this.guildID = guildID;
-        this.liveChannelID = liveChannelID;
     }
 
     /**
      * @param event The {@link ChannelGoLiveEvent}.
      */
     @EventSubscriber
     public void printChannelLive(@NotNull ChannelGoLiveEvent event) {
-        // TODO: Remove This Later. This executes.
-        BeanBot.getLogManager().log(this.getClass(), LogLevel.INFO, (event.getChannel().getName() + " is now online at https://www.twitch.tv/" + event.getChannel().getName()), true, false);
-
+        String liveChannelID = BeanBot.getGuildHandler().getCustomGuild(guildID).getLiveChannelID();
         TextChannel liveChannel = BeanBot.getGuildHandler().getGuild(guildID).getTextChannelById(liveChannelID);
 
         try {
@@ -63,7 +57,6 @@ public MessageEmbed liveEmbed(@NotNull ChannelGoLiveEvent event) {
         embedBuilder.setImage(event.getStream().getThumbnailUrl(320, 180));
         embedBuilder.addField("Game", event.getStream().getGameName(), true);
         embedBuilder.addField("Viewers", String.valueOf(event.getStream().getViewerCount()), true);
-
         return embedBuilder.build();
     }