update deps and deal with discords new ratelimits

danlivingston · May 30, 2020 · c5a583b · c5a583b
1 parent f1e301b
commit c5a583b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.sedmelluq</groupId>
             <artifactId>lavaplayer</artifactId>
-            <version>1.3.46</version>
+            <version>1.3.49</version>
         </dependency>
         <dependency>
             <groupId>com.sedmelluq</groupId>

diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java b/src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java
@@ -29,6 +29,7 @@
 import net.dv8tion.jda.core.entities.Message;
 import net.dv8tion.jda.core.entities.TextChannel;
 import net.dv8tion.jda.core.exceptions.PermissionException;
+import net.dv8tion.jda.core.exceptions.RateLimitedException;
 
 /**
  *
@@ -119,12 +120,13 @@ else if(tchan.getTopic().contains("\u200B"))
             {
                 try 
                 {
-                    if(wait)
-                        tchan.getManager().setTopic(text).complete();
-                    else
-                        tchan.getManager().setTopic(text).queue();
+                    // normally here if 'wait' was false, we'd want to queue, however,
+                    // new discord ratelimits specifically limiting changing channel topics
+                    // mean we don't want a backlog of changes piling up, so if we hit a 
+                    // ratelimit, we just won't change the topic this time
+                    tchan.getManager().setTopic(text).complete(wait);
                 } 
-                catch(PermissionException ignore) {}
+                catch(PermissionException | RateLimitedException ignore) {}
             }
         }
     }