Changeset 369 for binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

Timestamp:

Nov 9, 2021, 6:28:33 PM (3 years ago)

Author:

alloc

Message:

Preparations for A20 release
Changes usage of "SteamID" to "UserID" in console commands
Also changes a bunch of the WebAPI stuff to show / use UserIDs

File:

• binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs (modified) (4 diffs)

binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

@@ -1 @@
-using System;
 using System.Collections.Generic;
 using AllocsFixes.PersistentData;
@@ -14 +13 @@
                                "  2. listknownplayers -online\n" +
                                "  3. listknownplayers -notbanned\n" +
-                               "  4. listknownplayers <player name / steamid>\n" +
+                               "  4. listknownplayers <player name / userid>\n" +
                                "1. Lists all players that have ever been online\n" +
                                "2. Lists only the players that are currently online\n" +
                                "3. Lists only the players that are not banned\n" +
-                               "4. Lists all players whose name contains the given string or matches the given SteamID";
+                               "4. Lists all players whose name contains the given string or matches the given UserID";
                 }
 
@@ -31 +30 @@
                         bool notBannedOnly = false;
                         string nameFilter = string.Empty;
-                        bool isSteamId = false;
+                        PlatformUserIdentifierAbs userIdFilter = null;
 
                         if (_params.Count == 1) {
-                                long steamid;
                                 if (_params [0].EqualsCaseInsensitive ("-online")) {
                                         onlineOnly = true;
                                 } else if (_params [0].EqualsCaseInsensitive ("-notbanned")) {
                                         notBannedOnly = true;
-                                } else if (_params [0].Length == 17 && long.TryParse (_params [0], out steamid)) {
-                                        isSteamId = true;
+                                } else if (PlatformUserIdentifierAbs.TryFromCombinedString (_params [0], out userIdFilter)) {
+                                        // if true nothing to do, set by the out parameter
                                 } else {
                                         nameFilter = _params [0];
@@ -46 +44 @@
                         }
 
-                        if (isSteamId) {
-                                Player p = PersistentContainer.Instance.Players [_params [0], false];
+                        if (userIdFilter != null) {
+                                Player p = PersistentContainer.Instance.Players [userIdFilter, false];
 
                                 if (p != null) {
-                                        SdtdConsole.Instance.Output (string.Format (
-                                                "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}",
-                                                0, p.Name, p.EntityID, _params [0], p.IsOnline, p.IP,
-                                                p.TotalPlayTime / 60,
-                                                p.LastOnline.ToString ("yyyy-MM-dd HH:mm"))
+                                        SdtdConsole.Instance.Output (
+                                                $"{0}. {p.Name}, id={p.EntityID}, steamid={_params [0]}, online={p.IsOnline}, ip={p.IP}, playtime={p.TotalPlayTime / 60} m, seen={p.LastOnline:yyyy-MM-dd HH:mm}"
                                         );
                                 } else {
-                                        SdtdConsole.Instance.Output (string.Format ("SteamID {0} unknown!", _params [0]));
+                                        SdtdConsole.Instance.Output ($"SteamID {_params [0]} unknown!");
                                 }
                         } else {
                                 int num = 0;
-                                foreach (KeyValuePair<string, Player> kvp in PersistentContainer.Instance.Players.Dict) {
+                                foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in PersistentContainer.Instance.Players.Dict) {
                                         Player p = kvp.Value;
 
                                         if (
                                                 (!onlineOnly || p.IsOnline)
-                                                && (!notBannedOnly || !admTools.IsBanned (kvp.Key))
+                                                && (!notBannedOnly || !admTools.IsBanned (kvp.Key, out _, out _))
                                                 && (nameFilter.Length == 0 || p.Name.ContainsCaseInsensitive (nameFilter))
                                         ) {
-                                                SdtdConsole.Instance.Output (string.Format (
-                                                        "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}",
-                                                        ++num, p.Name, p.EntityID, kvp.Key, p.IsOnline, p.IP,
-                                                        p.TotalPlayTime / 60,
-                                                        p.LastOnline.ToString ("yyyy-MM-dd HH:mm"))
+                                                SdtdConsole.Instance.Output (
+                                                        $"{++num}. {p.Name}, id={p.EntityID}, steamid={kvp.Key}, online={p.IsOnline}, ip={p.IP}, playtime={p.TotalPlayTime / 60} m, seen={p.LastOnline:yyyy-MM-dd HH:mm}"
                                                 );
                                         }
                                 }
 
-                                SdtdConsole.Instance.Output ("Total of " + PersistentContainer.Instance.Players.Count + " known");
+                                SdtdConsole.Instance.Output ($"Total of {PersistentContainer.Instance.Players.Count} known");
                         }
                 }