Fixed an a bug in bans / tracking popups that'd lead to conflicts when multiple admins use these popups at the same time

Author: KirillMysnik

srcds/addons/source-python/plugins/admin/plugins/included/admin_kick_ban/bans/base.py

@@ -9,6 +9,7 @@
 # Source.Python
 from listeners.tick import GameThread
 from menus import PagedMenu, PagedOption, SimpleMenu, SimpleOption, Text
+from players.dictionary import PlayerDictionary
 from players.helpers import get_client_language
 from steam import SteamID
 from translations.manager import language_manager
@@ -380,7 +381,7 @@ class LiftAnyBanPopupFeature(Feature):
 
     def __init__(self):
         # (_BannedPlayerInfo instance, whether confirmed or not)
-        self._selected_ban = (None, False)
+        self._selected_bans = PlayerDictionary(lambda index: (None, False))
 
         self.ban_popup = PagedMenu(title=self.popup_title)
         self.confirm_popup = SimpleMenu()
@@ -402,41 +403,41 @@ def build_callback(popup, index):
 
         @self.ban_popup.register_select_callback
         def select_callback(popup, index, option):
-            self._selected_ban = option.value
+            self._selected_bans[index] = option.value
             clients[index].send_popup(self.confirm_popup)
 
         @self.confirm_popup.register_build_callback
         def build_callback(popup, index):
             popup.clear()
 
             popup.append(Text(plugin_strings['ban_record'].tokenized(
-                name=self._selected_ban[0].name,
-                id=self._selected_ban[0].uniqueid
+                name=self._selected_bans[index][0].name,
+                id=self._selected_bans[index][0].uniqueid
             )))
 
             popup.append(Text(
                 plugin_strings['ban_record admin_steamid'].tokenized(
-                    admin_steamid=self._selected_ban[0].banned_by)))
+                    admin_steamid=self._selected_bans[index][0].banned_by)))
 
             popup.append(Text(plugin_strings['ban_record reason'].tokenized(
-                reason=self._selected_ban[0].reason)))
+                reason=self._selected_bans[index][0].reason)))
 
-            if self._selected_ban[0].notes:
+            if self._selected_bans[index][0].notes:
                 popup.append(Text(plugin_strings['ban_record notes'].tokenized(
-                    notes=self._selected_ban[0].notes)))
+                    notes=self._selected_bans[index][0].notes)))
 
             popup.append(Text(
                 plugin_strings['lift_reviewed_ban_confirmation']))
 
             popup.append(SimpleOption(
                 choice_index=1,
                 text=plugin_strings['lift_reviewed_ban_confirmation no'],
-                value=(self._selected_ban[0], False),
+                value=(self._selected_bans[index][0], False),
             ))
             popup.append(SimpleOption(
                 choice_index=2,
                 text=plugin_strings['lift_reviewed_ban_confirmation yes'],
-                value=(self._selected_ban[0], True),
+                value=(self._selected_bans[index][0], True),
             ))
 
         @self.confirm_popup.register_select_callback
@@ -498,15 +499,13 @@ class ReviewBanPopupFeature(Feature):
 
     def __init__(self):
         # (_BannedPlayerInfo instance, reason, duration)
-        self._selected_ban = (None, "", -1)
+        self._selected_bans = PlayerDictionary(lambda index: (None, "", -1))
 
         self.ban_popup = PagedMenu(title=self.popup_title)
         self.reason_popup = PagedMenu(title=self.popup_title,
                                       parent_menu=self.ban_popup)
 
-        # We do not allow returning back to reason popup from duration popup,
-        # because we won't have valid self._selected_ban to build a reason
-        # popup with. Hence we don't provide parent_menu here.
+        # TODO: Provide parent menu
         self.duration_popup = PagedMenu(title=self.popup_title)
 
         @self.ban_popup.register_build_callback
@@ -527,7 +526,7 @@ def build_callback(popup, index):
 
         @self.ban_popup.register_select_callback
         def select_callback(popup, index, option):
-            self._selected_ban = option.value
+            self._selected_bans[index] = option.value
             clients[index].send_popup(self.reason_popup)
 
         @self.reason_popup.register_build_callback
@@ -538,7 +537,7 @@ def build_callback(popup, index):
                 popup.append(PagedOption(
                     text=stock_ban_reason.translation,
                     value=(
-                        self._selected_ban[0],
+                        self._selected_bans[index][0],
                         stock_ban_reason.translation.get_string(
                             language_manager.default),
                         stock_ban_reason.duration,
@@ -547,26 +546,27 @@ def build_callback(popup, index):
 
         @self.reason_popup.register_select_callback
         def select_callback(popup, index, option):
-            self._selected_ban = option.value
+            self._selected_bans[index] = option.value
             clients[index].send_popup(self.duration_popup)
 
         @self.duration_popup.register_build_callback
         def build_callback(popup, index):
             popup.clear()
 
-            if self._selected_ban[2] is not None:
+            if self._selected_bans[index][2] is not None:
                 popup.append(PagedOption(
                     text=plugin_strings['default_duration'].tokenized(
-                        default=format_ban_duration(self._selected_ban[2])),
-                    value=self._selected_ban
+                        default=format_ban_duration(
+                            self._selected_bans[index][2])),
+                    value=self._selected_bans[index]
                 ))
 
             for stock_ban_duration in stock_ban_durations:
                 popup.append(PagedOption(
                     text=format_ban_duration(stock_ban_duration),
                     value=(
-                        self._selected_ban[0],
-                        self._selected_ban[1],
+                        self._selected_bans[index][0],
+                        self._selected_bans[index][1],
                         stock_ban_duration,
                     )
                 ))
@@ -597,7 +597,7 @@ class SearchBadBansPopupFeature(Feature):
 
     def __init__(self):
         # (_BannedPlayerInfo instance, whether to remove or not)
-        self._selected_ban = None
+        self._selected_bans = PlayerDictionary(lambda index: (None, False))
 
         self.ban_popup = PagedMenu(title=self.popup_title)
         self.remove_popup = SimpleMenu()
@@ -620,38 +620,38 @@ def build_callback(popup, index):
 
         @self.ban_popup.register_select_callback
         def select_callback(popup, index, option):
-            self._selected_ban = option.value
+            self._selected_bans[index] = option.value
             clients[index].send_popup(self.remove_popup)
 
         @self.remove_popup.register_build_callback
         def build_callback(popup, index):
             popup.clear()
 
             popup.append(Text(plugin_strings['ban_record'].tokenized(
-                name=self._selected_ban[0].name,
-                id=self._selected_ban[0].uniqueid
+                name=self._selected_bans[index][0].name,
+                id=self._selected_bans[index][0].uniqueid
             )))
 
             popup.append(Text(
                 plugin_strings['ban_record admin_steamid'].tokenized(
-                    admin_steamid=self._selected_ban[0].banned_by)))
+                    admin_steamid=self._selected_bans[index][0].banned_by)))
 
-            if self._selected_ban[0].notes:
+            if self._selected_bans[index][0].notes:
                 popup.append(Text(plugin_strings['ban_record notes'].tokenized(
-                    notes=self._selected_ban[0].notes)))
+                    notes=self._selected_bans[index][0].notes)))
 
             popup.append(Text(
                 plugin_strings['remove_bad_ban_confirmation']))
 
             popup.append(SimpleOption(
                 choice_index=1,
                 text=plugin_strings['remove_bad_ban_confirmation no'],
-                value=(self._selected_ban[0], False),
+                value=(self._selected_bans[index][0], False),
             ))
             popup.append(SimpleOption(
                 choice_index=2,
                 text=plugin_strings['remove_bad_ban_confirmation yes'],
-                value=(self._selected_ban[0], True),
+                value=(self._selected_bans[index][0], True),
             ))
 
         @self.remove_popup.register_select_callback

srcds/addons/source-python/plugins/admin/plugins/included/admin_tracking/admin_tracking.py

@@ -162,7 +162,7 @@ class _TrackPopupFeature(PlayerBasedFeature):
     allow_execution_on_equal_priority = True
 
     def __init__(self):
-        self._selected_record = None
+        self._selected_records = PlayerDictionary(lambda index: None)
         self._records_to_show = None
 
         self.record_popup = PagedMenu(
@@ -199,36 +199,36 @@ def build_callback(popup, index):
         def select_callback(popup, index, option):
             client = clients[index]
 
-            self._selected_record = option.value
+            self._selected_records[index] = option.value
             client.send_popup(self.track_popup)
 
         @self.track_popup.register_build_callback
         def build_callback(popup, index):
             popup.title = plugin_strings['popup_title record_title'].tokenized(
                 seen_at=strftime(
                     "%d %b %Y %H:%M:%S", localtime(
-                        self._selected_record.seen_at)
+                        self._selected_records[index].seen_at)
                 ),
-                name=format_player_name(self._selected_record.name)
+                name=format_player_name(self._selected_records[index].name)
             )
 
             popup.clear()
             popup.append(Text(plugin_strings['popup_text name'].tokenized(
-                name=self._selected_record.name,  # Non-formatted name
+                name=self._selected_records[index].name,  # Non-formatted name
             )))
             popup.append(Text(plugin_strings['popup_text steamid'].tokenized(
-                steamid=self._selected_record.steamid,
+                steamid=self._selected_records[index].steamid,
             )))
             popup.append(Text(
                 plugin_strings['popup_text ip_address'].tokenized(
-                    ip_address=self._selected_record.ip_address,
+                    ip_address=self._selected_records[index].ip_address,
             )))
             popup.append(PagedOption(
                 text=plugin_strings['popup_title search_for_ip'].tokenized(
-                    ip_address=self._selected_record.ip_address),
+                    ip_address=self._selected_records[index].ip_address),
                 value=(
                     _TrackPopupOption.SEARCH_BY_IP,
-                    self._selected_record.ip_address
+                    self._selected_records[index].ip_address
                 )
             ))