Fix command front end not unregistering its callback when admin included/custom plugin is unloaded

Author: KirillMysnik

srcds/addons/source-python/plugins/admin/core/frontends/commands.py

@@ -4,6 +4,7 @@
 # Source.Python
 from commands import CommandReturn
 from commands.typed import TypedClientCommand, TypedSayCommand
+from core import AutoUnload
 from filters.players import PlayerIter
 
 # Source.Python Admin
@@ -61,7 +62,7 @@ def iter_filter_targets(filter_str, filter_args, issuer):
 # =============================================================================
 # >> CLASSES
 # =============================================================================
-class BaseFeatureCommand:
+class BaseFeatureCommand(AutoUnload):
     def __init__(self, commands, feature):
         if isinstance(commands, str):
             commands = [commands, ]
@@ -70,17 +71,21 @@ def __init__(self, commands, feature):
 
         self.feature = feature
 
-        TypedSayCommand(
+        self._public_chat_command = TypedSayCommand(
             ['!spa', ] + commands, feature.flag
-        )(self._get_public_chat_callback())
+        )
 
-        TypedSayCommand(
+        self._private_chat_command = TypedSayCommand(
             ['/spa', ] + commands, feature.flag
-        )(self._get_private_chat_callback())
+        )
 
-        TypedClientCommand(
+        self._client_command = TypedClientCommand(
             ['spa', ] + commands, feature.flag
-        )(self._get_client_callback())
+        )
+
+        self._public_chat_command(self._get_public_chat_callback())
+        self._private_chat_command(self._get_private_chat_callback())
+        self._client_command(self._get_client_callback())
 
     def _get_public_chat_callback(self):
         raise NotImplementedError
@@ -91,6 +96,11 @@ def _get_private_chat_callback(self):
     def _get_client_callback(self):
         raise NotImplementedError
 
+    def _unload_instance(self):
+        self._public_chat_command._unload_instance()
+        self._private_chat_command._unload_instance()
+        self._client_command._unload_instance()
+
 
 class FeatureCommand(BaseFeatureCommand):
     def _execute(self, command_info):