make !silence effect min_args and unknown-command

closes #160

1 files changed, 11 insertions, 4 deletions

diff --git a/modules/silence.py b/modules/silence.py
index 9aca4fed..f4f6b32a 100644
--- a/modules/silence.py
+++ b/modules/silence.py
@@ -12,8 +12,11 @@ class Module(ModuleManager.BaseModule):
 
     def _is_silenced(self, target):
         silence_until = target.get_setting("silence-until", None)
-        if silence_until and time.time()<silence_until:
-            return True
+        if not silence_until == None:
+            if time.time()<silence_until:
+                return True
+            else:
+                target.del_setting("silence-until")
         return False
 
     @utils.hook("received.command.silence", channel_only=True)
@@ -55,5 +58,9 @@ class Module(ModuleManager.BaseModule):
             if silence_until:
                 if self._is_silenced(event["target"]):
                     return utils.consts.PERMISSION_HARD_FAIL
-                else:
-                    event["target"].del_setting("silence-until")
+
+    @utils.hook("unknown.command")
+    @utils.kwarg("priority", EventManager.PRIORITY_HIGH)
+    def unknown_command(self, event):
+        if event["is_channel"] and self._is_silenced(event["target"]):
+            event.eat()