Merge branch 'development' into master

GospelBG · Jul 28, 2024 · 30c7dc0 · 30c7dc0
2 parents 5bad3f6 + be9b194
commit 30c7dc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/src/main/java/me/gosdev/chatpointsttv/ChatPointsTTV.java b/core/src/main/java/me/gosdev/chatpointsttv/ChatPointsTTV.java
@@ -142,8 +142,12 @@ public String getConnectedUsername() {
         return accountConnected ? user.getLogin() : "Not Linked";
     }
     public String getListenedChannel() {
-        if (config.getString("CHANNEL_USERNAME") == null | config.getString("CHANNEL_USERNAME").startsWith("MemorySection[path=")) return null; // Invalid string (probably left default "{YOUR CHANNEL}")) return null;
-        return config.getString("CHANNEL_USERNAME");
+        if (plugin != null) {
+            return client.getChat().getChannels().iterator().next(); // UNTESTED 
+        } else {
+            if (plugin.config.getString("TWITCH_CHANNEL_USERNAME") == null | plugin.config.getString("TWITCH_CHANNEL_USERNAME").startsWith("MemorySection[path=")) return null; // Invalid string (probably left default "{YOUR CHANNEL}")) return null;
+            return plugin.config.getString("TWITCH_CHANNEL_USERNAME");
+        }
     }
 
     private static Utils utils;

diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
@@ -95,4 +95,4 @@ STRINGS:
   FOLLOWED_STRING: "has started following"
   CHEERED_STRING: "cheered" #..."100 bits"
   SUB_STRING: "has subscribed with" #..."Tier 1/2/3/Prime"
-  GIFT_STRING: "gifted" #..."5 subs"
+  GIFT_STRING: "gifted" #..."5 subs"