Fix error when editing blacklist record (#1169)

* Fix error when editing blacklist record

Signed-off-by: Tim Raaymakers <43066279+timraay@users.noreply.github.com>

* Update blacklist player fetch

---------

Signed-off-by: Tim Raaymakers <43066279+timraay@users.noreply.github.com>

Author: timraay

rcon/blacklist.py

@@ -398,10 +398,14 @@ def synchronize_ban(
         return
 
     # Check whether the player is online (and grab their name)
-    player_name = next(
-        (p_name for p_name, p_id in rcon.get_player_ids() if p_id == player_id), None
-    )
-    is_online = player_name is not None
+    try:
+        player_info = rcon.get_detailed_player_info(player_id=player_id)
+    except HLLCommandFailedError:
+        player_name = None
+        is_online = False
+    else:
+        player_name = player_info["name"]
+        is_online = True
 
     if (
         new_record.blacklist.sync != BlacklistSyncMethod.BAN_IMMEDIATELY
@@ -1060,7 +1064,10 @@ def handle_edit_record(self, payload: BlacklistEditRecordCommand):
 
             # Check whether the old or new record had or has priority
             elif new_record.id == old_record["id"] or (
-                SERVER_NUMBER in old_record["blacklist"]["servers"]
+                (
+                    old_record["blacklist"]["servers"] is None
+                    or SERVER_NUMBER in old_record["blacklist"]["servers"]
+                )
                 and _is_higher_priority_record(
                     old_record["created_at"],
                     old_record["expires_at"],

rcon/commands.py

@@ -317,7 +317,7 @@ def get_all_player_info(self) -> list[dict[str, Any]]:
         # TODO: Updated function signatures
         return self.exchange("GetServerInformation", 2, {"Name": "players", "Value": ""}).content_dict["players"]
 
-    def get_player_info(self, player_id: str, can_fail=True) -> dict[str, Any] | None:
+    def get_player_info(self, player_id: str) -> dict[str, Any] | None:
         # TODO: Updated function signatures
         return self.exchange("GetServerInformation", 2, {"Name": "player", "Value": player_id}).content_dict
 

rcon/hooks.py

@@ -501,7 +501,8 @@ def handle_on_connect(
 ):
     try:
         rcon.get_players.cache_clear()
-        rcon.get_player_info.clear_for(player=struct_log["player_id_1"])
+        rcon.get_player_info.clear_for(player_id=struct_log["player_id_1"])
+        rcon.get_detailed_player_info.clear_for(player_id=struct_log["player_id_1"])
     except Exception:
         logger.exception("Unable to clear cache for %s", player_id)
 

rcon/rcon.py

@@ -11,6 +11,7 @@
 
 from dateutil import parser
 
+from rcon.connection import HLLCommandError
 import rcon.steam_utils
 from rcon.cache_utils import get_redis_client, invalidates, ttl_cache
 from rcon.commands import HLLCommandFailedError, ServerCtl, VipId
@@ -432,13 +433,16 @@ def _has_leader(self, squad) -> bool:
     @ttl_cache(ttl=60 * 60 * 24, cache_falsy=False)
     def get_player_info(self, player_id: str, can_fail=False):
         try:
-            player = super().get_player_info(player_id, can_fail=can_fail)
-            if not player:
+            try:
+                player = super().get_player_info(player_id)
+            except HLLCommandError:
                 return {}
 
             profile = rcon.steam_utils.get_steam_profile(steam_id_64=player_id)
 
         except (HLLCommandFailedError, ValueError):
+            # TODO: What's going on here? Why do we have the `can_fail` arg even?
+
             # Making that debug instead of exception as it's way to spammy
             logger.exception("Can't get player info for %s", player_id)
             # logger.exception("Can't get player info for %s", player)
@@ -461,9 +465,10 @@ def get_player_info(self, player_id: str, can_fail=False):
 
     @ttl_cache(ttl=2, cache_falsy=False)
     def get_detailed_player_info(self, player_id: str, player: GetPlayersType | None = None) -> GetDetailedPlayer:
-        raw = super().get_player_info(player_id, can_fail=False)
-        if not raw:
-            raise HLLCommandFailedError("Got bad data")
+        try:
+            raw = super().get_player_info(player_id)
+        except HLLCommandError:
+            raise HLLCommandFailedError("Player is not online")
         return self._get_detailed_player_info(player_id, raw, player)
 
     def _get_detailed_player_info(self, player_id: str, raw: dict[str, Any],