From 24714923be4c55fdac434a868707e917b6ed21b1 Mon Sep 17 00:00:00 2001
From: Adam Fourney <adamfo@microsoft.com>
Date: Mon, 11 Nov 2024 20:49:23 -0800
Subject: [PATCH] Addressing comments in PR.

---
 aprsd/cmds/dev.py    | 2 +-
 aprsd/cmds/server.py | 2 +-
 aprsd/plugin.py      | 2 +-
 aprsd/threads/rx.py  | 9 +--------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/aprsd/cmds/dev.py b/aprsd/cmds/dev.py
index 0754b6d..dc760e8 100644
--- a/aprsd/cmds/dev.py
+++ b/aprsd/cmds/dev.py
@@ -101,7 +101,7 @@ def test_plugin(
 
     pm = plugin.PluginManager()
     if load_all:
-        pm.setup_plugins()
+        pm.setup_plugins(load_help_plugin=CONF.load_help_plugin)
     obj = pm._create_class(plugin_path, plugin.APRSDPluginBase)
     if not obj:
         click.echo(ctx.get_help())
diff --git a/aprsd/cmds/server.py b/aprsd/cmds/server.py
index 6f66ddb..176d592 100644
--- a/aprsd/cmds/server.py
+++ b/aprsd/cmds/server.py
@@ -65,7 +65,7 @@ def server(ctx, flush):
     # log file output.
     LOG.info("Loading Plugin Manager and registering plugins")
     plugin_manager = plugin.PluginManager()
-    plugin_manager.setup_plugins()
+    plugin_manager.setup_plugins(load_help_plugin=CONF.load_help_plugin)
 
     # Dump all the config options now.
     CONF.log_opt_values(LOG, logging.DEBUG)
diff --git a/aprsd/plugin.py b/aprsd/plugin.py
index 9a8ae64..20d8d5e 100644
--- a/aprsd/plugin.py
+++ b/aprsd/plugin.py
@@ -470,7 +470,7 @@ class PluginManager:
     def reload_plugins(self):
         with self.lock:
             del self._pluggy_pm
-            self.setup_plugins()
+            self.setup_plugins(load_help_plugin=CONF.load_help_plugin)
 
     def setup_plugins(
         self, load_help_plugin=True,
diff --git a/aprsd/threads/rx.py b/aprsd/threads/rx.py
index 444aff8..b75f520 100644
--- a/aprsd/threads/rx.py
+++ b/aprsd/threads/rx.py
@@ -334,15 +334,8 @@ class APRSDPluginProcessPacketThread(APRSDProcessPacketThread):
             # response, then we send a usage statement.
             if to_call == CONF.callsign and not replied:
 
-                # Is the help plugin installed?
-                help_available = False
-                for p in pm.get_message_plugins():
-                    if isinstance(p, plugin.HelpPlugin):
-                        help_available = True
-                        break
-
                 # Tailor the messages accordingly
-                if help_available:
+                if CONF.load_help_plugin:
                     LOG.warning("Sending help!")
                     message_text = "Unknown command! Send 'help' message for help"
                 else: