committing again

Author: RhythmicSys

src/main/java/simplexity/simplenicks/commands/Set.java

@@ -4,16 +4,20 @@
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
+import simplexity.simplenicks.SimpleNicks;
+import simplexity.simplenicks.config.ConfigHandler;
 import simplexity.simplenicks.config.LocaleHandler;
 import simplexity.simplenicks.util.Constants;
 import simplexity.simplenicks.util.NickHandler;
 import simplexity.simplenicks.util.TagPermission;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 public class Set extends SubCommand {
     MiniMessage serializer = MiniMessage.builder().tags(TagResolver.empty()).build();
@@ -33,9 +37,12 @@ public void executeOnOther(CommandSender sender, Player player, String[] args) {
             nickComponent = miniMessage.deserialize(nickname);
         } else if (sender.hasPermission(Constants.NICK_OTHERS_BASIC)) {
             nickComponent = getNickComponent(sender, nickname);
-        } else if (sender.hasPermission(Constants.NICK_OTHERS_RESTRICTIVE)){
+        } else if (sender.hasPermission(Constants.NICK_OTHERS_RESTRICTIVE)) {
             nickComponent = getNickComponent(player, nickname);
         }
+        if (!passesChecks(sender, nickname, player)) {
+            return;
+        }
         if (setPlayerNick(player, nickComponent)) {
             sender.sendMessage(parsedMessage(sender, player, LocaleHandler.getInstance().getChangedOther(), nickname));
             player.sendMessage(parsedMessage(sender, player, LocaleHandler.getInstance().getChangedByOther(), nickname));
@@ -48,6 +55,9 @@ public void executeOnOther(CommandSender sender, Player player, String[] args) {
     public void executeOnSelf(CommandSender sender, Player player, String[] args) {
         if (!validateArgsLength(sender, player, args, 2)) return;
         String nickname = args[1];
+        if (!passesChecks(sender, nickname, player)) {
+            return;
+        }
         Component nickComponent = getNickComponent(sender, nickname);
         if (setPlayerNick(player, nickComponent)) {
             player.sendMessage(parsedMessage(sender, player, LocaleHandler.getInstance().getChangedSelf(), nickname));
@@ -106,4 +116,34 @@ private Component getNickComponent(CommandSender user, String nick) {
         return finalNick;
     }
 
+    private boolean passesChecks(CommandSender sender, String nickname, Player player) {
+        String strippedMessage = miniMessage.stripTags(nickname);
+        Pattern regexPattern = ConfigHandler.getInstance().getRegex();
+        if (strippedMessage.length() > ConfigHandler.getInstance().getMaxLength() && !sender.hasPermission(Constants.NICK_LENGTH_BYPASS)) {
+            sender.sendMessage(parsedMessage(sender, null, LocaleHandler.getInstance().getInvalidNickLength(), ""));
+            return false;
+        }
+        if (!regexPattern.matcher(strippedMessage).matches() && !sender.hasPermission(Constants.NICK_REGEX_BYPASS)) {
+            sender.sendMessage(parsedMessage(sender, null, LocaleHandler.getInstance().getInvalidNick(), ConfigHandler.getInstance().getRegexString()));
+            return false;
+        }
+        OfflinePlayer playerToCheck = SimpleNicks.getInstance().getServer().getOfflinePlayer(strippedMessage);
+        if (!playerToCheck.hasPlayedBefore()) {
+            return true;
+        }
+        if (playerToCheck.getPlayer() == player) {
+            return true;
+        }
+        if (!sender.hasPermission(Constants.NICK_USERNAME_BYPASS)) {
+            long lastSeen = playerToCheck.getLastSeen();
+            long now = System.currentTimeMillis();
+            long diff = now - lastSeen;
+            if (diff < ConfigHandler.getInstance().getUsernameProtectionTime()) {
+                sender.sendMessage(parsedMessage(sender, null, LocaleHandler.getInstance().getOtherPlayersUsername(), nickname));
+                return false;
+            }
+        }
+        return true;
+    }
+
 }

src/main/java/simplexity/simplenicks/config/ConfigHandler.java

@@ -8,6 +8,10 @@
 
 public class ConfigHandler {
 
+    public String getRegexString() {
+        return regexString;
+    }
+
     public enum SAVING_TYPE {PDC, FILE}
 
     private static ConfigHandler instance;
@@ -17,6 +21,8 @@ public enum SAVING_TYPE {PDC, FILE}
     private int maxLength = 25;
     private int maxSaves = 5;
     private boolean tablistNick = false;
+    private String regexString = "[A-Za-z0-9_]+";
+    private long usernameProtectionTime = 0;
 
     private ConfigHandler() {
     }
@@ -33,6 +39,7 @@ public void reloadConfig() {
         // Check the validity of the regex.
         try {
             String regexSetting = SimpleNicks.getInstance().getConfig().getString("nickname-regex");
+            regexString = regexSetting;
             assert regexSetting != null;
             assert !regexSetting.isBlank();
             regex = Pattern.compile(regexSetting);
@@ -50,6 +57,7 @@ public void reloadConfig() {
         maxLength = SimpleNicks.getInstance().getConfig().getInt("max-nickname-length");
         maxSaves = SimpleNicks.getInstance().getConfig().getInt("max-saves");
         tablistNick = SimpleNicks.getInstance().getConfig().getBoolean("tablist-nick");
+        usernameProtectionTime = SimpleNicks.getInstance().getConfig().getLong("username-protection-time") * 86400000;
     }
 
     public void setConfigDefaults() {
@@ -59,6 +67,7 @@ public void setConfigDefaults() {
         config.addDefault("max-saves", 5);
         config.addDefault("nickname-regex", "[A-Za-z0-9_]+");
         config.addDefault("tablist-nick", false);
+        config.addDefault("username-protection-time", 30);
     }
 
     public Pattern getRegex() {
@@ -80,4 +89,8 @@ public int getMaxSaves() {
     public boolean shouldNickTablist() {
         return tablistNick;
     }
+
+    public long getUsernameProtectionTime() {
+        return usernameProtectionTime;
+    }
 }

src/main/java/simplexity/simplenicks/util/Constants.java

@@ -9,9 +9,11 @@ public class Constants {
     public static Permission NICK_OTHERS_FULL = new Permission("simplenick.admin.full");
     public static Permission NICK_RESET_OTHERS = new Permission("simplenick.admin.reset");
     public static Permission NICK_RESET = new Permission("simplenick.nick.reset");
-    public static Permission NICK_SAVE = new Permission("simplenick.save");
+    public static Permission NICK_SAVE = new Permission("simplenick.nick.save");
     public static Permission NICK_OTHERS_SAVE = new Permission("simplenick.admin.save");
-    public static Permission NICK_DELETE = new Permission("simplenick.delete");
+    public static Permission NICK_DELETE = new Permission("simplenick.nick.delete");
     public static Permission NICK_RELOAD = new Permission("simplenick.reload");
-    public static Permission NICK_USERNAME_BYPASS = new Permission("simplenick.usernamebypass");
+    public static Permission NICK_USERNAME_BYPASS = new Permission("simplenick.bypass.username");
+    public static Permission NICK_LENGTH_BYPASS = new Permission("simplenick.bypass.length");
+    public static Permission NICK_REGEX_BYPASS = new Permission("simplenick.bypass.regex");
 }

src/main/resources/config.yml

@@ -17,4 +17,9 @@ max-saves: 5
 
 # Should names be changed in tablist?
 # (Keep this false if you use any other tablist plugin, there are placeholder API placeholders to use on those)
-tablist-nick: false
+tablist-nick: false
+
+# How long should people be offline before their username is available to use as a nickname?
+# In days, -1 to disable username protection altogether
+
+username-protection: 30