using /api [name] should be same as /api p [name]

123DMWM · Jun 9, 2017 · bb75755 · bb75755
1 parent 162cb5c
commit bb75755
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/fCraft/Commands/InfoCommands.cs b/fCraft/Commands/InfoCommands.cs
@@ -1925,34 +1925,39 @@ private static void APIPInfoHandler(Player player, CommandReader cmd) {
                 CdApi.PrintUsage(player);
                 return;
             }
+
             string value = cmd.Next();
-            if (value == null) {
+            if (value == null) { value = type; type = "player"; }
-                value = "player/" + player.Name;
-            }
             int id;
+
             switch (type.ToLower()) {
                 case "id":
                 case "i":
                     if (!int.TryParse(value, out id)) {
                         player.Message("ID not valid integer!");
                         return;
-                    } else {
-                        value = "id/" + id;
                     }
+
+                    value = "id/" + id;
                     break;
+
                 case "player":
                 case "p":
+                    if (!Player.IsValidPlayerName(value)) {
+                        player.Message("Name not a valid player name!");
+                        return;
+                    }
+
                     value = "player/" + value;
                     break;
-                default:
-                    value = "player/" + player.Name;
-                    break;
             }
+
             string data = Server.downloadDatastring("http://www.classicube.net/api/" + value);
             if (string.IsNullOrEmpty(data) || !data.Contains("username")) {
                 player.Message("Player not found!");
                 return;
             }
+
             JsonObject result = JsonObject.Parse(data);   
             string error;
             result.TryGetValue("error", out error);