refactor Minecraft whitelistings in a function for shorter code

src/main/java/uk/co/angrybee/joe/DiscordClient.java

@@ -435,11 +435,7 @@ public void onMessageReceived(MessageReceivedEvent messageReceivedEvent)
  // not not on whitelist, nice
  if (!notOnWhitelist) // aka on the whitelist
  {
- if (WhitelistedPlayers.usingEasyWhitelist)
- ExecuteServerCommand("easywl remove " + finalNameToRemove);
- else
- ExecuteServerCommand("whitelist remove " + finalNameToRemove);
-
+ UnWhitelist(finalNameToRemove);
  // Configure message here instead of on the main thread - this means this will run even if the message is never sent, but is a good trade off (I think)
  EmbedBuilder embedBuilderSuccess;
 
@@ -489,9 +485,6 @@ public void onMessageReceived(MessageReceivedEvent messageReceivedEvent)
  channel.sendMessage(embedBuilderSuccess.build()).queue();
  TempRemoveOriginalMessageAfterSeconds(messageReceivedEvent);
 
- //remove perms
- RemovePerms(finalNameToRemove);
-
  if(whitelistedRoleAutoRemove)
  {
  List<String> whitelistRoles = new LinkedList<>();
@@ -727,17 +720,8 @@ else if (whitelistRoles.isEmpty())
  if(MainConfig.getMainConfig().getBoolean("unwhitelist-and-clear-perms-on-name-clear"))
  {
  // Remove name from the whitelist
- if(!WhitelistedPlayers.usingEasyWhitelist)
- {
- DiscordClient.ExecuteServerCommand("whitelist remove " + splitMessage[userNameIndex]);
- }
- else
- {
- DiscordClient.ExecuteServerCommand("easywl remove " + splitMessage[userNameIndex]);
- }
+ UnWhitelist(splitMessage[userNameIndex]);
 
- // Clear permissions
- RemovePerms(splitMessage[userNameIndex]);
  }
 
  // Success message
@@ -825,14 +809,7 @@ else if (whitelistRoles.isEmpty())
  {
  for (Object minecraftNameToRemove : ls)
  {
- if (WhitelistedPlayers.usingEasyWhitelist)
- {
- ExecuteServerCommand("easywl remove " + minecraftNameToRemove.toString());
- }
- else
- {
- ExecuteServerCommand("whitelist remove " + minecraftNameToRemove.toString());
- }
+ UnWhitelist(minecraftNameToRemove.toString());
  }
 
  try
@@ -1105,12 +1082,7 @@ public void onGuildMemberRemove(@Nonnull GuildMemberRemoveEvent event)
  for (Object minecraftNameToRemove : ls)
  {
  DiscordWhitelister.getPlugin().getLogger().info(minecraftNameToRemove.toString() + " left. Removing their whitelisted entries.");
- if (WhitelistedPlayers.usingEasyWhitelist)
- {
- ExecuteServerCommand("easywl remove " + minecraftNameToRemove.toString());
- } else {
- ExecuteServerCommand("whitelist remove " + minecraftNameToRemove.toString());
- }
+ UnWhitelist(minecraftNameToRemove.toString());
  }
 
  try
@@ -1174,14 +1146,7 @@ private static void CheckForRequiredRole(GuildMemberRoleRemoveEvent e)
 
  for(Object mcName : regUsers)
  {
- if(WhitelistedPlayers.usingEasyWhitelist)
- {
- ExecuteServerCommand("easywl remove " + mcName.toString());
- }
- else
- {
- ExecuteServerCommand("whitelist remove " + mcName.toString());
- }
+ UnWhitelist(mcName.toString());
  }
 
  try
@@ -1253,13 +1218,7 @@ public static void RequiredRoleStartupCheck() {
  if (!requiredRole) {
  for (int i = 0; i < entry.getValue().size(); i++) {
  // un-whitelist
- if (!WhitelistedPlayers.usingEasyWhitelist) {
- DiscordClient.ExecuteServerCommand("whitelist remove " + entry.getValue().get(i));
- } else {
- DiscordClient.ExecuteServerCommand("easywl remove " + entry.getValue().get(i));
- }
- //remove permissions
- RemovePerms(entry.getValue().get(i));
+ UnWhitelist(entry.getValue().get(i));
  DiscordWhitelister.getPluginLogger().info("Removed " + entry.getValue().get(i)
  + " from the whitelist as Discord ID: " + entry.getKey() + " due to missing required role (" + roleToCheck + ").");
  }
@@ -1308,13 +1267,8 @@ public static void ServerLeaveStartupCheck() {
  if (!inGuild) {
  for (int i = 0; i < entry.getValue().size(); i++) {
  // un-whitelist
- if (!WhitelistedPlayers.usingEasyWhitelist) {
- DiscordClient.ExecuteServerCommand("whitelist remove " + entry.getValue().get(i));
- } else {
- DiscordClient.ExecuteServerCommand("easywl remove " + entry.getValue().get(i));
- }
+ UnWhitelist(entry.getValue().get(i));
  //remove permissions
- RemovePerms(entry.getValue().get(i));
  DiscordWhitelister.getPluginLogger().info("Removed " + entry.getValue().get(i)
  + " from the whitelist as Discord ID: " + entry.getKey() + " has left the server.");
  }
@@ -1632,4 +1586,15 @@ public static void RemovePerms(String targetPlayerName){
  }
  }
  }
+
+ // Remove player from whitelist
+ public static void UnWhitelist(String minecraftNameToRemove) {
+ if (WhitelistedPlayers.usingEasyWhitelist) {
+ ExecuteServerCommand("easywl remove " + minecraftNameToRemove);
+ } else {
+ ExecuteServerCommand("whitelist remove " + minecraftNameToRemove);
+ }
+ // Clear permissions
+ RemovePerms(minecraftNameToRemove);
+ }
 }

src/main/java/uk/co/angrybee/joe/events/OnBanEvent.java

@@ -125,14 +125,7 @@ public void onCommandBan(PlayerCommandPreprocessEvent e) throws IOException
  // Remove whitelisted players associated with the discord id
  for(int i = 0; i < targetWhitelistedPlayers.size(); i++)
  {
- if(!WhitelistedPlayers.usingEasyWhitelist)
- {
- DiscordClient.ExecuteServerCommand("whitelist remove " + targetWhitelistedPlayers.get(i));
- }
- else
- {
- DiscordClient.ExecuteServerCommand("easywl remove " + targetWhitelistedPlayers.get(i));
- }
+ DiscordClient.UnWhitelist(targetWhitelistedPlayers.get(i));
 
  DiscordWhitelister.getPluginLogger().info("Removed " + targetWhitelistedPlayers.get(i)
  + " from the whitelist as they were added by Discord Id: " + targetDiscordId);
@@ -144,9 +137,6 @@ public void onCommandBan(PlayerCommandPreprocessEvent e) throws IOException
  // Remove the users whitelisted players from the list
  UserList.getUserList().set(targetDiscordId, null);
 
- // Remove perms on ban if enabled
- DiscordClient.RemovePerms(banTarget);
-
  UserList.SaveStore();
 
  // Find all servers bot is in, assign & remove roles