Adjustment to U18 changes

Author: Dorfieeee

rcon/vote_map.py

@@ -25,7 +25,7 @@
 )
 from rcon.models import PlayerID, PlayerOptins, enter_session
 from rcon.player_history import get_player
-from rcon.rcon import CommandFailedError, Rcon, get_rcon
+from rcon.rcon import HLLCommandFailedError, Rcon, get_rcon
 from rcon.types import (
     PlayerProfileType,
     StructuredLogLineWithMetaData,
@@ -202,15 +202,15 @@ def format_map_vote(
                     join_char="\n",
                 )
                 text.append(f"OFFENSIVES:\n{vote_options}")
-            if len(categorized[maps.GameMode.CONTROL]):
+            if len(categorized[maps.GameMode.SKIRMISH]):
                 vote_options = VoteMap.join_vote_options(
                     selection=categorized[maps.GameMode.SKIRMISH],
                     maps_to_numbers=maps_to_numbers,
                     ranked_votes=ranked_votes,
                     total_votes=total_vote_counts,
                     join_char="\n",
                 )
-                text.append(f"CONTROL SKIRMISHES:\n{vote_options}")
+                text.append(f"SKIRMISHES:\n{vote_options}")
 
         return "\n\n".join(text)
 
@@ -443,7 +443,7 @@ def is_time_for_reminder(self) -> bool:
         return False
 
     def _get_optin_players(self) -> List[Tuple[str, str]]:
-        online_players = self._rcon.get_playerids()
+        online_players = self._rcon.get_player_ids()
         online_player_ids = [player_id for _, player_id in online_players]
 
         # No players online
@@ -530,7 +530,7 @@ def send_reminder(self, force: bool = False) -> ActionResult:
                     player_id=player_id,
                     message=reminder_message,
                 )
-            except CommandFailedError:
+            except HLLCommandFailedError:
                 logger.warning("Unable to message %s", name)
 
         self.set_last_reminder_time()
@@ -902,7 +902,7 @@ def __suggest_new_selection(
             categorized_maps[maps.GameMode.OFFENSIVE], num_offensive_options
         )
         skirmishes_control: list[maps.Layer] = self.__get_random_map_selection(
-            categorized_maps[maps.GameMode.CONTROL], num_skirmish_control_options
+            categorized_maps[maps.GameMode.SKIRMISH], num_skirmish_control_options
         )
 
         if (
@@ -916,7 +916,7 @@ def __suggest_new_selection(
             offensives = []
 
         if not allow_consecutive_skirmishes and current_map.game_mode in (
-            maps.GameMode.CONTROL,
+            maps.GameMode.SKIRMISH,
             maps.GameMode.PHASED,
             maps.GameMode.MAJORITY,
         ):

tests/test_vote_map.py

@@ -36,19 +36,19 @@
 CAR_SKIRMISH_DAY = Layer(
     id="CAR_S_1944_Day_P_Skirmish",
     map=MAPS["carentan"],
-    game_mode=GameMode.CONTROL,
+    game_mode=GameMode.SKIRMISH,
     environment=Environment.DAY,
 )
 CAR_SKIRMISH_RAIN = Layer(
     id="CAR_S_1944_Rain_P_Skirmish",
     map=MAPS["carentan"],
-    game_mode=GameMode.CONTROL,
+    game_mode=GameMode.SKIRMISH,
     environment=Environment.RAIN,
 )
 CAR_SKIRMISH_DUSK = Layer(
     id="CAR_S_1944_Dusk_P_Skirmish",
     map=MAPS["carentan"],
-    game_mode=GameMode.CONTROL,
+    game_mode=GameMode.SKIRMISH,
     environment=Environment.DUSK,
 )
 HUR_WARFARE_DAY = Layer(
@@ -91,7 +91,7 @@ def mock_rcon():
     """Fixture for mocking Rcon interactions."""
     rcon = MagicMock()
     rcon.get_maps.return_value = ALL_MAPS
-    rcon.get_playerids.return_value = [
+    rcon.get_player_ids.return_value = [
         ("Player1", "71234567890"),
         ("Player2", "0j8dkd3fj948h9fhv3m9thvm578"),
     ]