Admin correction to new guild format

This commit is contained in:
Matthew Cech
2021-01-02 15:18:58 -08:00
parent 59009a2408
commit 03d03e629d
2 changed files with 22 additions and 11 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ import dataStructures.KittyRole;
import dataStructures.KittyUser; import dataStructures.KittyUser;
import dataStructures.Response; import dataStructures.Response;
import dataStructures.UserInput; import dataStructures.UserInput;
import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent; import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import offline.Ref; import offline.Ref;
// Manages the fiddly bits and upkeep of the bot - while not // Manages the fiddly bits and upkeep of the bot - while not
+21 -10
View File
@@ -1,24 +1,30 @@
package utils; package utils;
import net.dv8tion.jda.core.entities.Guild; import java.util.*;
import net.dv8tion.jda.core.managers.GuildController; 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 public class AdminControl
{ {
private GuildController guildCon;
private Guild guild; private Guild guild;
public AdminControl(Guild guild) public AdminControl(Guild guild)
{ {
this.guild = guild; this.guild = guild;
guildCon = guild.getController();
} }
public boolean addRole(String memberID, String roleName) public boolean addRole(String memberID, String roleName)
{ {
try 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) catch(Exception e)
{ {
@@ -31,7 +37,12 @@ public class AdminControl
{ {
try 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) catch(Exception e)
{ {
@@ -44,7 +55,7 @@ public class AdminControl
{ {
try try
{ {
guildCon.kick(guild.getMemberById(memberID)).complete(); guild.kick(guild.getMemberById(memberID)).complete();
} }
catch(Exception e) catch(Exception e)
{ {
@@ -57,7 +68,7 @@ public class AdminControl
{ {
try try
{ {
guildCon.setMute(guild.getMemberById(memberID), true); guild.mute(guild.getMemberById(memberID), true);
return true; return true;
} }
catch(Exception e) catch(Exception e)
@@ -70,7 +81,7 @@ public class AdminControl
{ {
try try
{ {
guildCon.ban(guild.getMemberById(memberID), 0).complete(); guild.ban(guild.getMemberById(memberID), 0).complete();
return true; return true;
} }
catch(Exception e) catch(Exception e)