Add Formatter.ValidPlayerName method which takes into account the suf…

…fixes defined by the authentication services Also fix in GUI the right click player in players table -> Kick showing 'kicked by console' twice in kick message
ClassiCube · Nov 3, 2021 · 35878c8 · 35878c8
1 parent d650dc1
commit 35878c8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/GUI/Window/Window.Main.cs b/GUI/Window/Window.Main.cs
@@ -46,7 +46,7 @@ public partial class Window : Form {
         void tsPlayer_Voice_Click(object sender, EventArgs e) {   PlayerCmd("Voice"); }
         void tsPlayer_Whois_Click(object sender, EventArgs e) {   PlayerCmd("WhoIs"); }       
         void tsPlayer_Ban_Click(object sender, EventArgs e) {     PlayerCmd("Ban"); }
-        void tsPlayer_Kick_Click(object sender, EventArgs e) {    PlayerCmd("Kick", "", " You have been kicked by the console."); }
+        void tsPlayer_Kick_Click(object sender, EventArgs e) {    PlayerCmd("Kick"); }
         void tsPlayer_Promote_Click(object sender, EventArgs e) { PlayerCmd("SetRank", "+up ", ""); }
         void tsPlayer_Demote_Click(object sender, EventArgs e) {  PlayerCmd("SetRank", "-down ", ""); }
 
@@ -80,7 +80,7 @@ public partial class Window : Form {
         void tsMap_Physics5_Click(object sender, EventArgs e) { LevelCmd("Physics", "", " 5"); }
         void tsMap_Save_Click(object sender, EventArgs e) {     LevelCmd("Save"); }
         void tsMap_Unload_Click(object sender, EventArgs e) {   LevelCmd("Unload"); }
-        void tsMap_Reload_Click(object sender, EventArgs e) {   LevelCmd("Reload", "", ""); }
+        void tsMap_Reload_Click(object sender, EventArgs e) {   LevelCmd("Reload"); }
 
 
 

diff --git a/MCGalaxy/Commands/Economy/CmdBalance.cs b/MCGalaxy/Commands/Economy/CmdBalance.cs
@@ -28,7 +28,7 @@ public sealed class CmdBalance : Command2 {
         public override void Use(Player p, string message, CommandData data) {
             if (CheckSuper(p, message, "player name")) return;
             if (message.Length == 0) message = p.name;
-            if (!Formatter.ValidName(p, message, "player")) return;
+            if (!Formatter.ValidPlayerName(p, message)) return;
 
             int matches = 1;
             Player who  = PlayerInfo.FindMatches(p, message, out matches);

diff --git a/MCGalaxy/Commands/Information/CmdSeen.cs b/MCGalaxy/Commands/Information/CmdSeen.cs
@@ -29,7 +29,7 @@ public sealed class CmdSeen : Command2 {
                 if (p.IsSuper) { SuperRequiresArgs(p, "player name"); return; }
                 message = p.name;
             }
-            if (!Formatter.ValidName(p, message, "player")) return;
+            if (!Formatter.ValidPlayerName(p, message)) return;
 
             int matches;
             Player pl = PlayerInfo.FindMatches(p, message, out matches);

diff --git a/MCGalaxy/Commands/Information/CmdWhois.cs b/MCGalaxy/Commands/Information/CmdWhois.cs
@@ -36,7 +36,7 @@ public sealed class CmdWhois : Command2 {
                 if (p.IsSuper) { SuperRequiresArgs(p, "player name"); return; }
                 message = p.name;
             }
-            if (!Formatter.ValidName(p, message, "player")) return;
+            if (!Formatter.ValidPlayerName(p, message)) return;
 
             int matches;
             Player who = PlayerInfo.FindMatches(p, message, out matches);

diff --git a/MCGalaxy/Commands/Maintenance/CmdInfoSwap.cs b/MCGalaxy/Commands/Maintenance/CmdInfoSwap.cs
@@ -46,7 +46,7 @@ public sealed class CmdInfoSwap : Command2 {
         }
 
         static string GetName(Player p, string name) {
-            if (!Formatter.ValidName(p, name, "player")) return null;
+            if (!Formatter.ValidPlayerName(p, name)) return null;
             if (PlayerInfo.FindExact(name) != null) {
                 p.Message("\"{0}\" must be offline to use &T/InfoSwap", name); return null;
             }

diff --git a/MCGalaxy/Commands/Moderation/ModActionCmd.cs b/MCGalaxy/Commands/Moderation/ModActionCmd.cs
@@ -148,7 +148,7 @@ public static class ModActionCmd {
         /// and requires a confirmation message for non-existent players. </summary>
         internal static string FindName(Player p, string action, string cmd,
                                         string cmdSuffix, string name, ref string reason) {
-            if (!Formatter.ValidName(p, name, "player")) return null;
+            if (!Formatter.ValidPlayerName(p, name)) return null;
             string match = MatchName(p, ref name);
             string confirmed = IsConfirmed(reason);
             if (confirmed != null) reason = confirmed;

diff --git a/MCGalaxy/Player/PlayerInfo.cs b/MCGalaxy/Player/PlayerInfo.cs
@@ -71,7 +71,7 @@ public static class PlayerInfo
         /// <returns> A Player instance if exactly one match was found </returns>
         public static Player FindMatches(Player pl, string name, out int matches, bool _useless = false) {
             matches = 0;
-            if (!Formatter.ValidName(pl, name, "player")) return null;
+            if (!Formatter.ValidPlayerName(pl, name)) return null;
 
             // Try to exactly match name first (because names have + at end)
             Player exact = FindExact(name);
@@ -82,7 +82,7 @@ public static class PlayerInfo
         }
 
         public static string FindMatchesPreferOnline(Player p, string name) {
-            if (!Formatter.ValidName(p, name, "player")) return null;
+            if (!Formatter.ValidPlayerName(p, name)) return null;
             int matches;
             Player target = FindMatches(p, name, out matches);
 

diff --git a/MCGalaxy/util/Formatting/Formatter.cs b/MCGalaxy/util/Formatting/Formatter.cs
@@ -18,6 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using MCGalaxy.Authentication;
 using MCGalaxy.Blocks;
 using MCGalaxy.Commands;
 
@@ -73,11 +74,25 @@ public static class Formatter
         public static void MessageNeedMinPerm(Player p, string action, LevelPermission perm) {
             p.Message("Only {0}&S{1}", Group.GetColoredName(perm), action);
         }
+
 
         public static bool ValidName(Player p, string name, string type) {
             const string alphabet = Player.USERNAME_ALPHABET + "+"; // compatibility with ClassiCubeAccountPlus
-            if (name.Length > 0 && name.ContainsAllIn(alphabet)) return true;
+            return IsValidName(p, name, type, alphabet);
+        }
+
+        public static bool ValidPlayerName(Player p, string name) {
+            string alphabet = Player.USERNAME_ALPHABET + "+"; // compatibility with ClassiCubeAccountPlus
 
+            foreach (AuthService service in AuthService.Services)
+            {
+                alphabet += service.Config.NameSuffix;
+            }
+            return IsValidName(p, name, "player", alphabet);
+        }
+
+    	static bool IsValidName(Player p, string name, string type, string alphabet) {
+            if (name.Length > 0 && name.ContainsAllIn(alphabet)) return true;
             p.Message("\"{0}\" is not a valid {1} name.", name, type);
             return false;
         }