Add support for guild avatars

Version 3.106.2

Author: duncte123

build.gradle.kts

@@ -35,7 +35,7 @@ plugins {
     pmd
 }
 
-val numberVersion = "3.106.1"
+val numberVersion = "3.106.2"
 
 project.group = "ml.duncte123.skybot"
 project.version = "${numberVersion}_${getGitHash()}"
@@ -77,7 +77,7 @@ dependencies {
 
     // JDA (java discord api)
 //     implementation(group = "com.github.duncte123", name = "JDA", version = "af7956e") {
-    implementation(group = "net.dv8tion", name = "JDA", version = "4.3.0_346") {
+    implementation(group = "net.dv8tion", name = "JDA", version = "4.4.0_350") {
         exclude(module = "opus-java")
     }
 

src/main/java/fredboat/audio/player/LavalinkManager.java

@@ -70,8 +70,6 @@ public void start(DunctebotConfig config, AudioUtils audioUtils) {
 
     @SuppressWarnings("unused") // we need it from eval
     public void forceEnable(boolean enabled) {
-        this.enabledOverride = enabled;
-
         if (enabled) {
             this.loadNodes();
         } else {
@@ -84,6 +82,9 @@ public void forceEnable(boolean enabled) {
                 this.lavalink.removeNode(i);
             }
         }
+
+        // Do this last, otherwise we can't disconnect
+        this.enabledOverride = enabled;
     }
 
     public boolean isEnabled() {

src/main/java/ml/duncte123/skybot/utils/AirUtils.java

@@ -158,18 +158,18 @@ public static void stopMusic(AudioUtils audioUtils) {
         }
     }
 
-    public static void stopMusic(Long guildId, AudioUtils audioUtils) {
+    public static void stopMusic(long guildId, AudioUtils audioUtils) {
         final GuildMusicManager mng = audioUtils.getMusicManagers().get(guildId);
 
         if (mng == null) {
             return;
         }
 
-        final LavalinkManager lavalinkManager = LavalinkManager.INS;
-
         mng.stopAndClear();
 
+        final LavalinkManager lavalinkManager = LavalinkManager.INS;
         final String guildIdString = Long.toString(guildId);
+
         if (lavalinkManager.isConnected(guildIdString)) {
             lavalinkManager.closeConnection(guildIdString);
         }

src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/AvatarCommand.kt

@@ -22,6 +22,7 @@ import me.duncte123.botcommons.messaging.MessageUtils.sendMsg
 import ml.duncte123.skybot.objects.command.Command
 import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.utils.FinderUtils
+import net.dv8tion.jda.api.entities.Member
 import net.dv8tion.jda.api.entities.User
 
 class AvatarCommand : Command() {
@@ -34,6 +35,7 @@ class AvatarCommand : Command() {
 
     override fun execute(ctx: CommandContext) {
         var user: User? = ctx.author
+        var member: Member? = null
 
         if (ctx.args.isNotEmpty()) {
             // We're searching for members in the guild to get more accurate results
@@ -43,7 +45,10 @@ class AvatarCommand : Command() {
                 val foundUsers = FinderUtils.searchUsers(ctx.argsRaw, ctx)
 
                 if (foundUsers.isNotEmpty()) foundUsers[0] else null
-            } else foundMembers[0].user
+            } else {
+                member = foundMembers[0]
+                member.user
+            }
         }
 
         if (user == null) {
@@ -52,6 +57,8 @@ class AvatarCommand : Command() {
             return
         }
 
-        sendMsg(ctx, "**${user.asTag}'s** avatar:\n${user.effectiveAvatarUrl}?size=4096")
+        val avUrl = member?.effectiveAvatarUrl ?: user.effectiveAvatarUrl
+
+        sendMsg(ctx, "**${user.asTag}'s** avatar:\n$avUrl?size=4096")
     }
 }