From 7c9b5ce51befc026d3555ef40bfe062110b9e78d Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Fri, 31 Jul 2015 13:29:26 -0400
Subject: [PATCH] Fix decorators

---
 src/decorators.py | 5 ++++-
 src/handler.py    | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/decorators.py b/src/decorators.py
index eda260e..a11e0f9 100644
--- a/src/decorators.py
+++ b/src/decorators.py
@@ -181,7 +181,10 @@ class hook:
         HOOKS[name].append(self)
 
     def __call__(self, func):
-        self.func = func
+        if isinstance(func, hook):
+            self.func = func.func
+        else:
+            self.func = func
         self.__doc__ = self.func.__doc__
         return self
 
diff --git a/src/handler.py b/src/handler.py
index 4a8e64d..1b0b7e6 100644
--- a/src/handler.py
+++ b/src/handler.py
@@ -101,6 +101,8 @@ def unhandled(cli, prefix, cmd, *args):
                     notify_error(cli, botconfig.CHANNEL, log)
 
 def connect_callback(cli):
+    @hook("endofmotd", hookid=294)
+    @hook("nomotd", hookid=294)
     def prepare_stuff(cli, *args):
         # just in case we haven't managed to successfully auth yet
         if not botconfig.SASL_AUTHENTICATION:
@@ -126,9 +128,6 @@ def connect_callback(cli):
 
         wolfgame.connect_callback(cli)
 
-    hook("endofmotd", hookid=294)(prepare_stuff)
-    hook("nomotd", hookid=294)(prepare_stuff)
-
     def mustregain(cli, *blah):
         if not botconfig.PASS:
             return