Merge pull request #238 from hickey/fix/list-enabled-cmds

List only enabled commands in the cmd response

Amended on merge: the enabled check passed the builtin `bool` as
`value_type`, which is a string parameter ('str'/'bool'/'int'/...).
That fell through to the unknown-type branch, logging a warning per
command per invocation and returning the raw string, so the comparison
against "false" only matched that exact spelling — `no`, `0`, `off`,
and `False` all stayed listed. The "false" fallback also hid commands
that have no [<Name>_Command] section at all.

Switched to the idiom already used at cmd_command.py:34
(fallback=True, value_type='bool') and added regression coverage for
every configparser boolean spelling plus the no-section default.

CHANGELOG.md

@@ -18,6 +18,8 @@ semantic versioning.
   endpoint is `https://api.adsb.lol/v2/`; existing `api_url` values pointing
   at `api.airplanes.live` are remapped automatically. Local readsb URLs are
   unchanged.
+- `cmd` no longer lists commands that are disabled in `config.ini`. Commands
+  with no `[<Name>_Command]` section at all are still listed, as before.
 
 ### Added
 

modules/commands/cmd_command.py

@@ -97,6 +97,9 @@ class CmdCommand(BaseCommand):
         for cmd_name, cmd_instance in self.bot.command_manager.commands.items():
             # Skip system commands without keywords (like greeter)
             if hasattr(cmd_instance, 'keywords') and cmd_instance.keywords:
+                section_name = cmd_instance._derive_config_section_name()
+                if not cmd_instance.get_config_value(section_name, 'enabled', fallback=True, value_type='bool'):
+                    continue
                 if not self._is_command_valid_for_channel(cmd_name, cmd_instance, message):
                     continue
                 all_commands.append(cmd_name)

tests/commands/test_cmd_command.py

@@ -2,7 +2,12 @@
 
 import pytest
 
+from modules.commands.alert_command import AlertCommand
 from modules.commands.cmd_command import CmdCommand
+from modules.commands.ping_command import PingCommand
+from modules.commands.sports_command import SportsCommand
+from modules.commands.trace_command import TraceCommand
+from modules.commands.wx_command import WxCommand
 from tests.conftest import mock_message
 
 
@@ -24,6 +29,89 @@ class TestCmdCommand:
         msg = mock_message(content="cmd", is_dm=True)
         assert cmd.can_execute(msg) is False
 
+    @pytest.mark.asyncio
+    async def test_is_not_listed_when_sports_cmd_disabled(self, command_mock_bot):
+        command_mock_bot.config.add_section("Cmd_Command")
+        command_mock_bot.config.set("Cmd_Command", "enabled", "true")
+        command_mock_bot.config.add_section("Ping_Command")
+        command_mock_bot.config.set("Ping_Command", "enabled", "true")
+        command_mock_bot.config.add_section("Wx_Command")
+        command_mock_bot.config.set("Wx_Command", "enabled", "true")
+        command_mock_bot.config.add_section("Sports_Command")
+        command_mock_bot.config.set("Sports_Command", "enabled", "false")
+        command_mock_bot.config.add_section("Trace_Command")
+        command_mock_bot.config.set("Trace_Command", "enabled", "true")
+        command_mock_bot.config.add_section("Alert_Command")
+        command_mock_bot.config.set("Alert_Command", "enabled", "true")
+
+        command_mock_bot.command_manager.keywords = {}
+        command_mock_bot.command_manager.commands = {
+            'ping': PingCommand(command_mock_bot),
+            'wx': WxCommand(command_mock_bot),
+            'sports': SportsCommand(command_mock_bot),
+            'trace': TraceCommand(command_mock_bot),
+            'alert': AlertCommand(command_mock_bot)
+        }
+
+        cmd = CmdCommand(command_mock_bot)
+        msg = mock_message(content="cmd", is_dm=True)
+        result = await cmd.execute(msg)
+        call_args = command_mock_bot.command_manager.send_response.call_args
+
+        assert result is True
+        assert 'ping' in call_args[0][1]
+        assert 'wx' in call_args[0][1]
+        assert 'sports' not in call_args[0][1]
+        assert 'trace' in call_args[0][1]
+        assert 'alert' in call_args[0][1]
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("disabled_value", ["false", "no", "0", "False", "FALSE", "off"])
+    async def test_is_not_listed_for_any_disabled_spelling(self, command_mock_bot, disabled_value):
+        """config.ini accepts every boolean spelling configparser does, not just 'false'."""
+        command_mock_bot.config.add_section("Cmd_Command")
+        command_mock_bot.config.set("Cmd_Command", "enabled", "true")
+        command_mock_bot.config.add_section("Ping_Command")
+        command_mock_bot.config.set("Ping_Command", "enabled", "true")
+        command_mock_bot.config.add_section("Sports_Command")
+        command_mock_bot.config.set("Sports_Command", "enabled", disabled_value)
+
+        command_mock_bot.command_manager.keywords = {}
+        command_mock_bot.command_manager.commands = {
+            'ping': PingCommand(command_mock_bot),
+            'sports': SportsCommand(command_mock_bot),
+        }
+
+        cmd = CmdCommand(command_mock_bot)
+        msg = mock_message(content="cmd", is_dm=True)
+        result = await cmd.execute(msg)
+        call_args = command_mock_bot.command_manager.send_response.call_args
+
+        assert result is True
+        assert 'ping' in call_args[0][1]
+        assert 'sports' not in call_args[0][1]
+
+    @pytest.mark.asyncio
+    async def test_is_listed_when_command_has_no_config_section(self, command_mock_bot):
+        """A command with no [<Name>_Command] section defaults to enabled, as before."""
+        command_mock_bot.config.add_section("Cmd_Command")
+        command_mock_bot.config.set("Cmd_Command", "enabled", "true")
+
+        command_mock_bot.command_manager.keywords = {}
+        command_mock_bot.command_manager.commands = {
+            'ping': PingCommand(command_mock_bot),
+            'sports': SportsCommand(command_mock_bot),
+        }
+
+        cmd = CmdCommand(command_mock_bot)
+        msg = mock_message(content="cmd", is_dm=True)
+        result = await cmd.execute(msg)
+        call_args = command_mock_bot.command_manager.send_response.call_args
+
+        assert result is True
+        assert 'ping' in call_args[0][1]
+        assert 'sports' in call_args[0][1]
+
     @pytest.mark.asyncio
     async def test_execute_returns_command_list(self, command_mock_bot):
         command_mock_bot.config.add_section("Cmd_Command")
@@ -85,8 +173,8 @@ class TestCmdCommand:
         commands = {}
         for i in range(25):
             name = f"longcommandname{i:02d}"
-            mock_cmd = type("MockCmd", (), {"keywords": [name]})()
-            commands[name] = mock_cmd
+            commands[name] = CmdCommand(command_mock_bot)
+            command_mock_bot.config.add_section(name.title() + "_Command")
         command_mock_bot.command_manager.commands = commands
         cmd = CmdCommand(command_mock_bot)
         # "Available commands: " = 20 chars; "longcommandnameNN" = 17 chars; ", " = 2 chars