Add ignorelist clear cmd

Fixes #142
AlexProgrammerDE · Nov 4, 2024 · 856c9d1 · 856c9d1
1 parent e0c2b57
commit 856c9d1
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/src/main/java/net/pistonmaster/pistonchat/commands/ignore/IgnoreListCommand.java b/src/main/java/net/pistonmaster/pistonchat/commands/ignore/IgnoreListCommand.java
@@ -14,6 +14,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
 
 import java.math.RoundingMode;
 import java.util.ArrayList;
@@ -48,6 +49,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             return true;
         }
 
+        if (args[0].equalsIgnoreCase("clear")) {
+            plugin.getIgnoreTool().clearIgnoredPlayers(player);
+            plugin.getCommonTool().sendLanguageMessage(player, "ignorelistcleared");
+            return true;
+        }
+
         try {
             int page = Integer.parseInt(args[0]);
 
@@ -66,7 +73,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return Collections.emptyList();
+        if (args.length == 1) {
+            return StringUtil.copyPartialMatches(args[0], List.of("clear"), new ArrayList<>());
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     private void showList(int page, Player player) {

diff --git a/src/main/java/net/pistonmaster/pistonchat/tools/HardIgnoreTool.java b/src/main/java/net/pistonmaster/pistonchat/tools/HardIgnoreTool.java
@@ -73,6 +73,16 @@ public List<UUID> getStoredList(Player player) {
         }
     }
 
+    public void clearIgnoredPlayers(Player player) {
+        try (Connection connection = plugin.getDs().getConnection()) {
+            PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `pistonchat_hard_ignores` WHERE `uuid`=?");
+            preparedStatement.setString(1, player.getUniqueId().toString());
+            preparedStatement.execute();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public enum HardReturn {
         IGNORE, UN_IGNORE
     }

diff --git a/src/main/java/net/pistonmaster/pistonchat/tools/IgnoreTool.java b/src/main/java/net/pistonmaster/pistonchat/tools/IgnoreTool.java
@@ -50,6 +50,11 @@ protected List<OfflinePlayer> convertIgnoredPlayer(List<UUID> listUUID) {
         return returnedPlayers;
     }
 
+    public void clearIgnoredPlayers(Player player) {
+        plugin.getSoftignoreTool().clearIgnoredPlayers(player);
+        plugin.getHardIgnoreTool().clearIgnoredPlayers(player);
+    }
+
     public enum IgnoreType {
         SOFT, HARD
     }

diff --git a/src/main/java/net/pistonmaster/pistonchat/tools/SoftIgnoreTool.java b/src/main/java/net/pistonmaster/pistonchat/tools/SoftIgnoreTool.java
@@ -15,6 +15,7 @@
 
 @RequiredArgsConstructor
 public class SoftIgnoreTool {
+    private static final String METADATA_KEY = "pistonchat_softignore";
     private final PistonChat plugin;
     private final Gson gson = new Gson();
 
@@ -28,7 +29,7 @@ public SoftReturn softIgnorePlayer(Player player, Player ignored) {
             list.add(ignored.getUniqueId());
         }
 
-        player.setMetadata("pistonchat_softignore", new FixedMetadataValue(plugin, gson.toJson(list)));
+        player.setMetadata(METADATA_KEY, new FixedMetadataValue(plugin, gson.toJson(list)));
 
         return contains ? SoftReturn.UN_IGNORE : SoftReturn.IGNORE;
     }
@@ -39,14 +40,18 @@ protected boolean isSoftIgnored(CommandSender chatter, Player receiver) {
     }
 
     protected List<UUID> getStoredList(Player player) {
-        List<MetadataValue> values = player.getMetadata("pistonchat_softignore");
+        List<MetadataValue> values = player.getMetadata(METADATA_KEY);
         if (values.isEmpty()) {
             return new ArrayList<>();
         }
 
         return gson.<List<String>>fromJson(values.get(0).asString(), List.class).stream().map(UUID::fromString).toList();
     }
 
+    public void clearIgnoredPlayers(Player player) {
+        player.removeMetadata(METADATA_KEY, plugin);
+    }
+
     public enum SoftReturn {
         IGNORE, UN_IGNORE
     }

diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml
@@ -21,3 +21,4 @@ ignore: "<gold>Now ignoring <dark_aqua><player_name>"
 unignore: "<gold>No longer ignoring <dark_aqua><player_name>"
 ignorehard: "<gold>Permanently ignoring <player_name>. This is saved in <dark_red>/ignorelist</dark_red>."
 unignorehard: "<gold>No longer permanently ignoring <dark_aqua><player_name>"
+ignorelistcleared: "<gold>Ignore list cleared."