Add leveling role add/remove reasons and make them run in exact order

Author: BlueTree242

src/main/java/tk/bluetree242/discordsrvutils/leveling/PlayerStats.java

@@ -25,12 +25,15 @@
 import github.scarsz.discordsrv.DiscordSRV;
 import github.scarsz.discordsrv.dependencies.jda.api.entities.Member;
 import github.scarsz.discordsrv.dependencies.jda.api.entities.Role;
+import github.scarsz.discordsrv.dependencies.jda.api.requests.RestAction;
 import tk.bluetree242.discordsrvutils.DiscordSRVUtils;
 import tk.bluetree242.discordsrvutils.exceptions.UnCheckedSQLException;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -103,14 +106,16 @@ public CompletableFuture<Boolean> setXP(int xp) {
                     LevelingManager manager = LevelingManager.get();
                     Member member = core.getGuild().retrieveMemberById(id).complete();
                     if (member == null) return true;
+                    Collection actions = new ArrayList<>();
                     for (Role role : manager.getRolesToRemove(level)) {
                         if (member.getRoles().contains(role))
-                            core.getGuild().removeRoleFromMember(member, role).queue();
+                            actions.add(core.getGuild().removeRoleFromMember(member, role).reason("User Leveled Up"));
                     }
                     Role toAdd = manager.getRoleForLevel(level);
                     if (toAdd != null) {
-                        core.getGuild().addRoleToMember(member, toAdd).queue();
+                        actions.add(core.getGuild().addRoleToMember(member, toAdd).reason("User Leveled Up"));
                     }
+                    RestAction.allOf(actions).queue();
                     return true;
                 }
                 PreparedStatement p1 = conn.prepareStatement("UPDATE leveling SET XP=? WHERE UUID=?");

src/main/java/tk/bluetree242/discordsrvutils/listeners/discordsrv/DiscordSRVListener.java

@@ -30,11 +30,16 @@
 import github.scarsz.discordsrv.api.events.DiscordReadyEvent;
 import github.scarsz.discordsrv.dependencies.jda.api.entities.Member;
 import github.scarsz.discordsrv.dependencies.jda.api.entities.Role;
+import github.scarsz.discordsrv.dependencies.jda.api.requests.RestAction;
 import org.bukkit.Bukkit;
 import tk.bluetree242.discordsrvutils.DiscordSRVUtils;
 import tk.bluetree242.discordsrvutils.exceptions.StartupException;
 import tk.bluetree242.discordsrvutils.leveling.LevelingManager;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 public class DiscordSRVListener {
     private final DiscordSRVUtils core = DiscordSRVUtils.get();
 
@@ -59,14 +64,16 @@ public void onLink(AccountLinkedEvent e) {
             if (id == null) return;
             Member member = core.getGuild().retrieveMemberById(id).complete();
             if (member == null) return;
+            Collection actions = new ArrayList<>();
             for (Role role : manager.getRolesToRemove(stats.getLevel())) {
                 if (member.getRoles().contains(role))
-                    core.getGuild().removeRoleFromMember(member, role).queue();
+                    actions.add(core.getGuild().removeRoleFromMember(member, role).reason("User should not have this role"));
             }
             Role toAdd = manager.getRoleForLevel(level);
             if (toAdd != null && !member.getRoles().contains(toAdd)) {
-                core.getGuild().addRoleToMember(member, toAdd).queue();
+                actions.add(core.getGuild().addRoleToMember(member, toAdd).reason("Account Linked"));
             }
+            RestAction.allOf(actions).queue();
         });
 
     }
@@ -81,7 +88,7 @@ public void onUnlink(AccountUnlinkedEvent e) {
             if (member != null) {
                 for (Role role : manager.getRolesToRemove(null)) {
                     if (member.getRoles().contains(role))
-                        core.getGuild().removeRoleFromMember(member, role).queue();
+                        core.getGuild().removeRoleFromMember(member, role).reason("Account Unlinked").queue();
                 }
             }
         });