From 03d03e629d5af891d8e906c1750ac997087bbc47 Mon Sep 17 00:00:00 2001
From: Matthew Cech <contact@matthewcech.com>
Date: Sat, 2 Jan 2021 15:18:58 -0800
Subject: [PATCH] Admin correction to new guild format

---
 src/main/Superintendent.java |  2 +-
 src/utils/AdminControl.java  | 31 +++++++++++++++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/Superintendent.java b/src/main/Superintendent.java
index 427b02f..17f96b9 100644
--- a/src/main/Superintendent.java
+++ b/src/main/Superintendent.java
@@ -14,7 +14,7 @@ import dataStructures.KittyRole;
 import dataStructures.KittyUser;
 import dataStructures.Response;
 import dataStructures.UserInput;
-import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import offline.Ref;
 
 // Manages the fiddly bits and upkeep of the bot - while not 
diff --git a/src/utils/AdminControl.java b/src/utils/AdminControl.java
index ce13637..5cf47f5 100644
--- a/src/utils/AdminControl.java
+++ b/src/utils/AdminControl.java
@@ -1,24 +1,30 @@
 package utils;
 
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.managers.GuildController;
+import java.util.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.internal.handle.GuildSetupController;
 
 public class AdminControl 
-{
-	private GuildController guildCon; 
+{ 
 	private Guild guild;
 	
 	public AdminControl(Guild guild)
 	{
 		this.guild = guild;
-		guildCon = guild.getController();
 	}
 	
 	public boolean addRole(String memberID, String roleName)
 	{
 		try
 		{
-			guildCon.addRolesToMember(guild.getMemberById(memberID), guild.getRolesByName(roleName, true)).complete();
+			Member member = guild.getMemberById(memberID);
+			List<Role> roles = guild.getRolesByName(roleName, true);
+			for(Role role : roles)
+			{
+				guild.addRoleToMember(member, role).complete();// submit instead? We need to queue.				
+			}
 		}
 		catch(Exception e)
 		{
@@ -31,7 +37,12 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.removeRolesFromMember(guild.getMemberById(memberID), guild.getRolesByName(roleName, true)).complete();
+			Member member = guild.getMemberById(memberID);
+			List<Role> roles = guild.getRolesByName(roleName, true);
+			for(Role role : roles)
+			{
+				guild.removeRoleFromMember(member, role).complete();
+			}
 		}
 		catch(Exception e)
 		{
@@ -44,7 +55,7 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.kick(guild.getMemberById(memberID)).complete();
+			guild.kick(guild.getMemberById(memberID)).complete();
 		}
 		catch(Exception e)
 		{
@@ -57,7 +68,7 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.setMute(guild.getMemberById(memberID), true);
+			guild.mute(guild.getMemberById(memberID), true);
 			return true;
 		}
 		catch(Exception e)
@@ -70,7 +81,7 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.ban(guild.getMemberById(memberID), 0).complete();
+			guild.ban(guild.getMemberById(memberID), 0).complete();
 			return true;
 		}
 		catch(Exception e)