refactoring: combining permission assignment and removal to functions

Shimell · Mar 16, 2021 · d545def · d545def
1 parent 0efbb9e
commit d545def
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 51 deletions.
diff --git a/src/main/java/uk/co/angrybee/joe/DiscordClient.java b/src/main/java/uk/co/angrybee/joe/DiscordClient.java
@@ -489,15 +489,8 @@ public void onMessageReceived(MessageReceivedEvent messageReceivedEvent)
  channel.sendMessage(embedBuilderSuccess.build()).queue();
  TempRemoveOriginalMessageAfterSeconds(messageReceivedEvent);
 
- if(DiscordWhitelister.useLuckPerms)
- {
- LpRemovePermsFromUser(finalNameToRemove, PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
- }
-
- if(DiscordWhitelister.useUltraPerms)
- {
- UpRemovePermsFromUser(finalNameToRemove, PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
- }
+ //remove perms
+ RemovePerms(finalNameToRemove);
 
  if(whitelistedRoleAutoRemove)
  {
@@ -745,11 +738,8 @@ else if (whitelistRoles.isEmpty())
 
  // Clear permissions
  // Clear permissions
- if(DiscordWhitelister.useLuckPerms)
- DiscordClient.LpRemovePermsFromUser(splitMessage[userNameIndex], PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
- if(DiscordWhitelister.useUltraPerms)
- DiscordClient.UpRemovePermsFromUser(splitMessage[userNameIndex], PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
- }
+ DiscordClient.RemovePerms(splitMessage[userNameIndex]);
+ }
 
  // Success message
  if(DiscordWhitelister.useCustomMessages)
@@ -1518,23 +1508,7 @@ public static void RemoveRolesFromUser(Guild targetGuild, String targetUserId, L
  }
  }
  }
- // TODO: improve, not go through console commands
- // For ultra perms
- public static void LpAssignPermsToUser(String targetPlayerName, List<String> permsToAssign)
- {
- for(int i = 0; i < permsToAssign.size(); i++)
- {
- DiscordClient.ExecuteServerCommand("lp user " + targetPlayerName + " permission set " + permsToAssign.get(i));
- }
- }
 
- public static void LpRemovePermsFromUser(String targetPlayerName, List<String> permsToRemove)
- {
- for(int i = 0; i < permsToRemove.size(); i++)
- {
- DiscordClient.ExecuteServerCommand("lp user " + targetPlayerName + " permission unset " + permsToRemove.get(i));
- }
- }
 
  public static void RemoveMessageAfterSeconds(MessageReceivedEvent messageReceivedEvent, Integer timeToWait)
  {
@@ -1568,21 +1542,35 @@ public static void TempRemoveOriginalMessageAfterSeconds(MessageReceivedEvent me
  RemoveMessageAfterSeconds(messageReceivedEvent, DiscordWhitelister.removeMessageWaitTime);
  }
 
+
  // TODO: improve, not go through console commands
- // For ultra perms
- public static void UpAssignPermsToUser(String targetPlayerName, List<String> permsToAssign)
- {
- for(int i = 0; i < permsToAssign.size(); i++)
- {
- DiscordClient.ExecuteServerCommand("upc addPlayerPermission " + targetPlayerName + " " + permsToAssign.get(i));
+ public static void AssignPerms(String targetPlayerName){
+ // For ultra perms:
+ if(DiscordWhitelister.useLuckPerms){
+ for (String s : PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist")) {
+ DiscordClient.ExecuteServerCommand("lp user " + targetPlayerName + " permission set " + s);
+ }
+ }
+ // For LuckPerms:
+ if(DiscordWhitelister.useUltraPerms){
+ for (String s : PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist")) {
+ DiscordClient.ExecuteServerCommand("upc addPlayerPermission " + targetPlayerName + " " + s);
+ }
  }
  }
 
- public static void UpRemovePermsFromUser(String targetPlayerName, List<String> permsToRemove)
- {
- for(int i = 0; i < permsToRemove.size(); i++)
- {
- DiscordClient.ExecuteServerCommand("upc removePlayerPermission " + targetPlayerName + " " + permsToRemove.get(i));
+ public static void RemovePerms(String targetPlayerName){
+ // For ultra perms:
+ if(DiscordWhitelister.useLuckPerms){
+ for (String s : PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist")) {
+ DiscordClient.ExecuteServerCommand("lp user " + targetPlayerName + " permission unset " + s);
+ }
+ }
+ // For LuckPerms:
+ if(DiscordWhitelister.useUltraPerms){
+ for (String s : PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist")) {
+ DiscordClient.ExecuteServerCommand("upc removePlayerPermission " + targetPlayerName + " " + s);
+ }
  }
  }
 }
diff --git a/src/main/java/uk/co/angrybee/joe/commands/discord/CommandAdd.java b/src/main/java/uk/co/angrybee/joe/commands/discord/CommandAdd.java
@@ -491,11 +491,8 @@ convert username into UUID to avoid depreciation and rate limits (according to h
  // For instructional message
  successfulWhitelist.set(true);
 
- if(DiscordWhitelister.useLuckPerms)
- DiscordClient.LpAssignPermsToUser(finalNameToAdd, PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
-
- if(DiscordWhitelister.useUltraPerms)
- DiscordClient.UpAssignPermsToUser(finalNameToAdd, PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
+ //Assign perms:
+ DiscordClient.AssignPerms(finalNameToAdd);
 
  if(DiscordWhitelister.useOnWhitelistCommands)
  {

diff --git a/src/main/java/uk/co/angrybee/joe/events/OnBanEvent.java b/src/main/java/uk/co/angrybee/joe/events/OnBanEvent.java
@@ -145,11 +145,7 @@ public void onCommandBan(PlayerCommandPreprocessEvent e) throws IOException
  UserList.getUserList().set(targetDiscordId, null);
 
  // Remove perms on ban if enabled
- if(DiscordWhitelister.useLuckPerms)
- DiscordClient.LpRemovePermsFromUser(banTarget, PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
-
- if(DiscordWhitelister.useUltraPerms)
- DiscordClient.UpRemovePermsFromUser(banTarget, PermissionsConfig.getPermissionsConfig().getStringList("perms-on-whitelist"));
+ DiscordClient.RemovePerms(banTarget);
 
  UserList.SaveStore();