Improvements about the auto sync system

SyncCommands-bungeecord/src/main/java/io/github/efekurbann/synccommands/SyncCommandsBungee.java

@@ -1,5 +1,7 @@
 package io.github.efekurbann.synccommands;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import io.github.efekurbann.synccommands.config.Config;
 import io.github.efekurbann.synccommands.enums.ConnectionType;
 import io.github.efekurbann.synccommands.executor.impl.BungeeExecutor;
@@ -30,7 +32,7 @@ public final class SyncCommandsBungee extends Plugin {
     private final Scheduler scheduler = new BungeeScheduler(this);
     private final Map<String, Server> servers = new HashMap<>();
     private final Map<String, Set<Server>> groups = new HashMap<>();
-    private final Map<UUID, String> autoSyncMode = new HashMap<>();
+    private final Cache<UUID, String> autoSyncMode = CacheBuilder.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES).build();
     private Server server;
     private Messaging messaging;
     private boolean connectedSuccessfully;
@@ -196,7 +198,7 @@ public Map<String, Set<Server>> getGroups() {
         return groups;
     }
 
-    public Map<UUID, String> getAutoSyncMode() {
+    public Cache<UUID, String> getAutoSyncMode() {
         return autoSyncMode;
     }
 }

SyncCommands-bungeecord/src/main/java/io/github/efekurbann/synccommands/command/BSyncCommand.java

@@ -38,7 +38,7 @@ public void execute(CommandSender sender, String[] args) {
                 return;
             }
 
-            if (!plugin.getAutoSyncMode().containsKey(player.getUniqueId())) {
+            if (!plugin.getAutoSyncMode().asMap().containsKey(player.getUniqueId())) {
                 plugin.getAutoSyncMode().put(player.getUniqueId(), target);
                 sender.sendMessage(TextComponent.fromLegacyText(
                         ChatUtils.color(String.format("&aSuccessfully enabled the auto sync mode for %s!", target)))
@@ -47,7 +47,7 @@ public void execute(CommandSender sender, String[] args) {
                         ChatUtils.color("&aFrom now on, all the commands that you execute will be synced."))
                 );
             } else {
-                plugin.getAutoSyncMode().remove(player.getUniqueId());
+                plugin.getAutoSyncMode().invalidate(player.getUniqueId());
                 sender.sendMessage(TextComponent.fromLegacyText(ChatUtils.color("&cDisabled the auto sync mode!")));
             }
 

SyncCommands-bungeecord/src/main/java/io/github/efekurbann/synccommands/listener/CommandListener.java

@@ -20,10 +20,10 @@ public void onCommand(ChatEvent event) {
         String command = event.getMessage().replace("/", "");
 
         ProxiedPlayer sender = (ProxiedPlayer) event.getSender();
-        if (!plugin.getAutoSyncMode().containsKey(sender.getUniqueId())) return;
+        if (!plugin.getAutoSyncMode().asMap().containsKey(sender.getUniqueId())) return;
         if (command.startsWith("bsync") || command.startsWith("bungeesync") || command.startsWith("syncbungee")) return;
 
-        String target = plugin.getAutoSyncMode().get(sender.getUniqueId());
+        String target = plugin.getAutoSyncMode().getIfPresent(sender.getUniqueId());
 
         event.setMessage(String.format("/bsync %s %s", target, command));
     }

SyncCommands-spigot/src/main/java/io/github/efekurbann/synccommands/SyncCommandsSpigot.java

@@ -1,5 +1,7 @@
 package io.github.efekurbann.synccommands;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import io.github.efekurbann.synccommands.command.SyncCommand;
 import io.github.efekurbann.synccommands.config.Config;
 import io.github.efekurbann.synccommands.enums.ConnectionType;
@@ -25,14 +27,16 @@
 import io.github.efekurbann.synccommands.scheduler.Scheduler;
 
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 public final class SyncCommandsSpigot extends JavaPlugin {
 
     private final Config config = new Config(this, "config.yml");
     private final ConsoleExecutor consoleExecutor = new BukkitExecutor(this);
     private final Map<String, Server> servers = new HashMap<>();
     private final Map<String, Set<Server>> groups = new HashMap<>();
-    private final Map<UUID, String> autoSyncMode = new HashMap<>();
+    // we will store the names instead of uuids
+    private final Cache<String, String> autoSyncMode = CacheBuilder.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES).build();
     private final Scheduler scheduler = new BukkitScheduler(this);
     private UpdateChecker updateChecker;
     private Messaging messaging;
@@ -216,7 +220,7 @@ public Map<String, Set<Server>> getGroups() {
         return groups;
     }
 
-    public Map<UUID, String> getAutoSyncMode() {
+    public Cache<String, String> getAutoSyncMode() {
         return autoSyncMode;
     }
 }

SyncCommands-spigot/src/main/java/io/github/efekurbann/synccommands/command/SyncCommand.java

@@ -3,7 +3,6 @@
 import io.github.efekurbann.synccommands.objects.server.Server;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import io.github.efekurbann.synccommands.SyncCommandsSpigot;
 import io.github.efekurbann.synccommands.objects.Command;
@@ -26,8 +25,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
             return true;
         }
 
-        if (args.length == 1 && sender instanceof Player) {
-            Player player = (Player) sender;
+        if (args.length == 1) {
             String target = args[0];
             if (!plugin.getGroups().containsKey(target)
                     && !plugin.getServers().containsKey(target)
@@ -36,8 +34,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
                 return true;
             }
 
-            if (!plugin.getAutoSyncMode().containsKey(player.getUniqueId())) {
-                plugin.getAutoSyncMode().put(player.getUniqueId(), target);
+            if (!plugin.getAutoSyncMode().asMap().containsKey(sender.getName())) {
+                plugin.getAutoSyncMode().put(sender.getName(), target);
                 sender.sendMessage(
                         ChatUtils.color(String.format("&aSuccessfully enabled the auto sync mode for %s!", target))
                 );
@@ -53,7 +51,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.comm
                                 "we can not detect that. And it wont be synced.")
                 );
             } else {
-                plugin.getAutoSyncMode().remove(player.getUniqueId());
+                plugin.getAutoSyncMode().invalidate(sender.getName());
                 sender.sendMessage(ChatUtils.color("&cDisabled the auto sync mode!"));
             }
 

SyncCommands-spigot/src/main/java/io/github/efekurbann/synccommands/listener/CommandListener.java

@@ -1,10 +1,12 @@
 package io.github.efekurbann.synccommands.listener;
 
 import io.github.efekurbann.synccommands.SyncCommandsSpigot;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.server.ServerCommandEvent;
 
 public class CommandListener implements Listener {
 
@@ -19,13 +21,27 @@ public void onCommand(PlayerCommandPreprocessEvent event) {
         String command = event.getMessage().replace("/", "");
 
         Player player = event.getPlayer();
-        if (!plugin.getAutoSyncMode().containsKey(player.getUniqueId())) return;
+        if (!plugin.getAutoSyncMode().asMap().containsKey(player.getName())) return;
         if (command.startsWith("bsync") || command.startsWith("bungeesync") || command.startsWith("syncbungee")
                 || command.startsWith("sync") || command.startsWith("ssync")) return;
 
-        String target = plugin.getAutoSyncMode().get(player.getUniqueId());
+        String target = plugin.getAutoSyncMode().getIfPresent(player.getName());
 
         event.setMessage(String.format("/sync %s %s", target, command));
     }
 
+    @EventHandler
+    public void onCommand(ServerCommandEvent event) {
+        String command = event.getCommand().replace("/", "");
+
+        CommandSender sender = event.getSender();
+        if (!plugin.getAutoSyncMode().asMap().containsKey(sender.getName())) return;
+        if (command.startsWith("bsync") || command.startsWith("bungeesync") || command.startsWith("syncbungee")
+                || command.startsWith("sync") || command.startsWith("ssync")) return;
+
+        String target = plugin.getAutoSyncMode().getIfPresent(sender.getName());
+
+        event.setCommand(String.format("sync %s %s", target, command));
+    }
+
 }