Fix socialspy toggle breaking on restarts

RhythmicSys · RhythmicSys · commit 1a03733cdb7a · 2024-12-30T21:57:36.000-08:00
diff --git a/src/main/java/simplexity/simplepms/commands/Blocklist.java b/src/main/java/simplexity/simplepms/commands/Blocklist.java
@@ -11,7 +11,7 @@
 import simplexity.simplepms.SimplePMs;
 import simplexity.simplepms.config.Message;
 import simplexity.simplepms.objects.PlayerBlock;
-import simplexity.simplepms.saving.SqlHandler;
+import simplexity.simplepms.saving.Cache;
 
 import java.util.List;
 import java.util.UUID;
@@ -27,7 +27,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             return false;
         }
         UUID uuid = player.getUniqueId();
-        List<PlayerBlock> blockList = SqlHandler.getInstance().getBlockList(uuid);
+        List<PlayerBlock> blockList = Cache.getBlockList(uuid);
         if (blockList.isEmpty()) {
             player.sendRichMessage(Message.BLOCKLIST_EMPTY.getMessage());
             return true;
diff --git a/src/main/java/simplexity/simplepms/commands/MessageToggle.java b/src/main/java/simplexity/simplepms/commands/MessageToggle.java
@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import simplexity.simplepms.config.Message;
 import simplexity.simplepms.objects.PlayerSettings;
+import simplexity.simplepms.saving.Cache;
 import simplexity.simplepms.saving.SqlHandler;
 
 import java.util.UUID;
@@ -21,11 +22,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         UUID uuid = player.getUniqueId();
         PlayerSettings playerSettings = SqlHandler.getInstance().getSettings(uuid);
         if (playerSettings.messagesDisabled()) {
-            SqlHandler.getInstance().setMessagesDisabled(uuid, false);
+            Cache.updateMessageSettings(uuid, false);
             player.sendRichMessage(Message.MESSAGES_ENABLED.getMessage());
             return true;
         }
-        SqlHandler.getInstance().setMessagesDisabled(uuid, true);
+        Cache.updateMessageSettings(uuid, false);
         player.sendRichMessage(Message.MESSAGES_DISABLED.getMessage());
         return true;
     }
diff --git a/src/main/java/simplexity/simplepms/commands/SocialSpy.java b/src/main/java/simplexity/simplepms/commands/SocialSpy.java
@@ -8,6 +8,7 @@
 import simplexity.simplepms.SimplePMs;
 import simplexity.simplepms.config.Message;
 import simplexity.simplepms.objects.PlayerSettings;
+import simplexity.simplepms.saving.Cache;
 import simplexity.simplepms.saving.SqlHandler;
 
 import java.util.UUID;
@@ -24,12 +25,12 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         UUID uuid = player.getUniqueId();
         PlayerSettings settings = SqlHandler.getInstance().getSettings(uuid);
         if (settings == null || settings.socialSpyEnabled()) {
-            SqlHandler.getInstance().setSocialSpyEnabled(uuid, false);
+            Cache.updateSocialSpySettings(uuid, false);
             sender.sendRichMessage(Message.SOCIAL_SPY_DISABLED.getMessage());
             SimplePMs.getSpyingPlayers().remove(player);
             return true;
         }
-        SqlHandler.getInstance().setSocialSpyEnabled(uuid, true);
+        Cache.updateSocialSpySettings(uuid, true);
         sender.sendRichMessage(Message.SOCIAL_SPY_ENABLED.getMessage());
         SimplePMs.getSpyingPlayers().add(player);
         return true;
diff --git a/src/main/java/simplexity/simplepms/commands/Unblock.java b/src/main/java/simplexity/simplepms/commands/Unblock.java
@@ -9,6 +9,7 @@
 import org.jetbrains.annotations.Nullable;
 import simplexity.simplepms.config.Message;
 import simplexity.simplepms.objects.PlayerBlock;
+import simplexity.simplepms.saving.Cache;
 import simplexity.simplepms.saving.SqlHandler;
 
 import java.util.ArrayList;
@@ -27,7 +28,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             return false;
         }
         String blockString = args[0];
-        List<PlayerBlock> playerBlockList = SqlHandler.getInstance().getBlockList(player.getUniqueId());
+        List<PlayerBlock> playerBlockList = Cache.getBlockList(player.getUniqueId());
         UUID blockedPlayerUUID = blockedPlayerUUID(blockString, playerBlockList);
         if (blockedPlayerUUID == null) {
             player.sendRichMessage(Message.PLAYER_NOT_BLOCKED.getMessage());
@@ -54,7 +55,7 @@ private UUID blockedPlayerUUID(String playerBlocked, List<PlayerBlock> playerBlo
             return null;
         }
         ArrayList<String> blocked = new ArrayList<>();
-        for (PlayerBlock block : SqlHandler.getInstance().getBlockList(player.getUniqueId())) {
+        for (PlayerBlock block : Cache.getBlockList(player.getUniqueId())) {
             blocked.add(block.blockedPlayerName());
         }
         return blocked;
diff --git a/src/main/java/simplexity/simplepms/config/Message.java b/src/main/java/simplexity/simplepms/config/Message.java
@@ -10,7 +10,7 @@ public enum Message {
     FORMAT_SENT("plugin.format.sent", "<gray>[<yellow>You</yellow> <gold>→</gold> <green><target></green>]</gray><reset> <message>"),
     FORMAT_RECEIVED("plugin.format.received", "<gray>[<green><initiator></green> <gold>→</gold> <yellow>You</yellow>]</gray><reset> <message>"),
     FORMAT_SOCIAL_SPY("plugin.format.social-spy", "<dark_gray>[<gray>Spy</gray>]</dark_gray> <gray><initiator> → <target></gray> <dark_gray>»</dark_gray> <gray><message></gray>"),
-    FORMAT_COMMAND_SPY("plugin.format.command-spy", "<dark_gray>[<gray>Spy</gray>]</dark_gray> <gray><initiator> used a tracked command: <yellow>[<command>]</yellow>. <gray>Full command: <message></gray>"),
+    FORMAT_COMMAND_SPY("plugin.format.command-spy", "<dark_gray>[<gray>Spy</gray>]</dark_gray> <gray><initiator> used <yellow>[<gray><message></gray>]</yellow>"),
     SOCIAL_SPY_ENABLED("plugin.social-spy.enabled", "<dark_gray>[<#989898>PM-Spy</#989898>]</dark_gray> <green>PM Spy has been enabled</green>"),
     SOCIAL_SPY_DISABLED("plugin.social-spy.disabled", "<dark_gray>[<#989898>PM-Spy</#989898>]</dark_gray> <gray>PM Spy has been disabled</gray>"),
     MESSAGES_ENABLED("plugin.message.toggle-enabled", "<green>You are now allowing direct messages</green>"),
diff --git a/src/main/java/simplexity/simplepms/logic/PreProcessing.java b/src/main/java/simplexity/simplepms/logic/PreProcessing.java
@@ -9,7 +9,7 @@
 import simplexity.simplepms.events.PrivateMessageEvent;
 import simplexity.simplepms.objects.PlayerBlock;
 import simplexity.simplepms.objects.PlayerSettings;
-import simplexity.simplepms.saving.SqlHandler;
+import simplexity.simplepms.saving.Cache;
 
 import java.util.HashMap;
 import java.util.List;
@@ -87,15 +87,15 @@ private boolean canSendToNonPlayer(CommandSender sender, CommandSender recipient
     }
 
     public boolean messagesDisabled(Player player) {
-        PlayerSettings playerSettings = SqlHandler.playerSettings.get(player.getUniqueId());
+        PlayerSettings playerSettings = Cache.playerSettings.get(player.getUniqueId());
         if (playerSettings == null) {
             return false;
         }
         return playerSettings.messagesDisabled();
     }
 
     public boolean userBlocked(Player player1, Player player2) {
-        List<PlayerBlock> playerBlocks = SqlHandler.blockList.get(player1.getUniqueId());
+        List<PlayerBlock> playerBlocks = Cache.blockList.get(player1.getUniqueId());
         if (playerBlocks == null) {
             return false;
         }
diff --git a/src/main/java/simplexity/simplepms/objects/PlayerSettings.java b/src/main/java/simplexity/simplepms/objects/PlayerSettings.java
@@ -13,6 +13,12 @@ public PlayerSettings(UUID playerUUID, boolean socialSpyEnabled, boolean message
         this.messagesDisabled = messagesDisabled;
     }
 
+    public PlayerSettings(UUID playerUUID) {
+        this.playerUUID = playerUUID;
+        this.socialSpyEnabled = false;
+        this.messagesDisabled = false;
+    }
+
     public String toString() {
         return "Player UUID: " + playerUUID.toString()
                 + "\nSocial Spy Enabled: " + socialSpyEnabled
diff --git a/src/main/java/simplexity/simplepms/saving/Cache.java b/src/main/java/simplexity/simplepms/saving/Cache.java
@@ -0,0 +1,69 @@
+package simplexity.simplepms.saving;
+
+import simplexity.simplepms.objects.PlayerBlock;
+import simplexity.simplepms.objects.PlayerSettings;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+public class Cache {
+    public static final HashMap<UUID, List<PlayerBlock>> blockList = new HashMap<>();
+    public static final HashMap<UUID, PlayerSettings> playerSettings = new HashMap<>();
+
+    public static List<PlayerBlock> getBlockList(UUID uuid) {
+        if (blockList.containsKey(uuid)) {
+            return blockList.get(uuid);
+        }
+        List<PlayerBlock> blockedPlayers = SqlHandler.getInstance().getBlockedPlayers(uuid);
+        blockList.put(uuid, blockedPlayers);
+        return blockedPlayers;
+    }
+
+    public static PlayerSettings getPlayerSettings(UUID uuid) {
+        if (playerSettings.containsKey(uuid)) {
+            return playerSettings.get(uuid);
+        }
+        PlayerSettings settings = SqlHandler.getInstance().getSettings(uuid);
+        playerSettings.put(uuid, settings);
+        return settings;
+    }
+
+    public static void updateSocialSpySettings(UUID uuid, boolean socialSpy){
+        PlayerSettings settings = getPlayerSettings(uuid);
+        settings.setSocialSpyEnabled(socialSpy);
+        playerSettings.put(uuid, settings);
+        SqlHandler.getInstance().updateSettings(uuid, settings);
+    }
+
+    public static void updateMessageSettings(UUID uuid, boolean messageDisabled){
+        PlayerSettings settings = getPlayerSettings(uuid);
+        settings.setMessagesDisabled(messageDisabled);
+        playerSettings.put(uuid, settings);
+        SqlHandler.getInstance().updateSettings(uuid, settings);
+    }
+
+    public static void addBlockedUser(UUID uuid, PlayerBlock playerBlock){
+        List<PlayerBlock> blockedPlayers = getBlockList(uuid);
+        blockedPlayers.removeIf( block -> {
+            UUID blockedUUID = playerBlock.blockedPlayerUUID();
+            UUID currentUUID = block.blockedPlayerUUID();
+            return currentUUID.equals(blockedUUID);
+        });
+        blockedPlayers.add(playerBlock);
+        blockList.put(uuid, blockedPlayers);
+        SqlHandler.getInstance().addBlockedPlayer(uuid, playerBlock.blockedPlayerUUID(), playerBlock.blockReason());
+    }
+
+    public static void removeBlockedUser(UUID uuid, PlayerBlock playerBlock){
+        List<PlayerBlock> blockedPlayers = getBlockList(uuid);
+        blockedPlayers.removeIf( block -> {
+            UUID blockedUUID = playerBlock.blockedPlayerUUID();
+            UUID currentUUID = block.blockedPlayerUUID();
+            return currentUUID.equals(blockedUUID);
+        });
+        blockList.put(uuid, blockedPlayers);
+        SqlHandler.getInstance().removeBlockedPlayer(uuid, playerBlock.blockedPlayerUUID());
+    }
+
+}
diff --git a/src/main/java/simplexity/simplepms/saving/SqlHandler.java b/src/main/java/simplexity/simplepms/saving/SqlHandler.java
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import simplexity.simplepms.events.PrivateMessageEvent;`
`10`	`10`	`import simplexity.simplepms.objects.PlayerBlock;`
`11`	`11`	`import simplexity.simplepms.objects.PlayerSettings;`
`12`		`-import simplexity.simplepms.saving.SqlHandler;`
	`12`	`+import simplexity.simplepms.saving.Cache;`
`13`	`13`
`14`	`14`	`import java.util.HashMap;`
`15`	`15`	`import java.util.List;`
`@@ -87,15 +87,15 @@ private boolean canSendToNonPlayer(CommandSender sender, CommandSender recipient`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public boolean messagesDisabled(Player player) {`
`90`		`- PlayerSettings playerSettings = SqlHandler.playerSettings.get(player.getUniqueId());`
	`90`	`+ PlayerSettings playerSettings = Cache.playerSettings.get(player.getUniqueId());`
`91`	`91`	`if (playerSettings == null) {`
`92`	`92`	`return false;`
`93`	`93`	`}`
`94`	`94`	`return playerSettings.messagesDisabled();`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`public boolean userBlocked(Player player1, Player player2) {`
`98`		`- List<PlayerBlock> playerBlocks = SqlHandler.blockList.get(player1.getUniqueId());`
	`98`	`+ List<PlayerBlock> playerBlocks = Cache.blockList.get(player1.getUniqueId());`
`99`	`99`	`if (playerBlocks == null) {`
`100`	`100`	`return false;`
`101`	`101`	`}`