move on to command.regex if a given command isn't found

1 files changed, 6 insertions, 3 deletions

diff --git a/modules/commands/__init__.py b/modules/commands/__init__.py
index 8cf56aa4..b05c1290 100644
--- a/modules/commands/__init__.py
+++ b/modules/commands/__init__.py
@@ -283,10 +283,9 @@ class Module(ModuleManager.BaseModule):
             command = event["message_split"][1].lower()
             args_split = event["message_split"][2:]
 
-        if command:
-            if event["action"]:
-                return
 
+        hook = None
+        if command:
             try:
                 hook, command, args_split = self._find_command_hook(
                     event["server"], command, True, args_split)
@@ -296,6 +295,10 @@ class Module(ModuleManager.BaseModule):
                     event["user"].nickname)
                 return
 
+        if hook:
+            if event["action"]:
+                return
+
             if hook:
                 self.command(event["server"], event["channel"],
                     event["target_str"], True, event["user"], command,