From ca2e901d5874128d4ebb2bb9f2b2d053194751c2 Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Mon, 1 Jun 2015 16:37:22 -0400
Subject: [PATCH 1/7] Mass overhaul to the decorators

---
 src/decorators.py | 357 ++++++++++++++++++++++++++--------------------
 src/handler.py    |  39 +++--
 src/wolfgame.py   |  16 +--
 3 files changed, 230 insertions(+), 182 deletions(-)

diff --git a/src/decorators.py b/src/decorators.py
index d5dfc93..8774077 100644
--- a/src/decorators.py
+++ b/src/decorators.py
@@ -1,167 +1,222 @@
-# Copyright (c) 2011, Jimmy Cao
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-# Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-# Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Old, obsolete & original code by jcao219
+# rewritten by Vgr
 
 import fnmatch
+from collections import defaultdict
 
 import botconfig
-import src.settings as var
 from oyoyo.parse import parse_nick
+from src import settings as var
 from src import logger
 
 adminlog = logger(None)
 
-def generate(fdict, permissions=True, **kwargs):
-    """Generates a decorator generator.  Always use this"""
-    def cmd(*s, raw_nick=False, admin_only=False, owner_only=False, chan=True, pm=False,
-                game=False, join=False, none=False, playing=False, roles=(), hookid=-1):
-        def dec(f):
-            def innerf(*args):
-                largs = list(args)
-                rawnick = largs[1]
-                if not permissions:
-                    return f(*largs)
-                if len(largs) > 1 and largs[1]:
-                    nick, _, _, cloak = parse_nick(largs[1])
+COMMANDS = defaultdict(list)
+HOOKS = defaultdict(list)
 
-                    if cloak is None:
-                        cloak = ""
+class cmd:
+    def __init__(self, *cmds, raw_nick=False, admin_only=False, owner_only=False,
+                 chan=True, pm=False, join=False, none=False, game=False, playing=False, roles=()):
+
+        self.cmds = cmds
+        self.raw_nick = raw_nick
+        self.admin_only = admin_only
+        self.owner_only = owner_only
+        self.chan = chan
+        self.pm = pm
+        self.join = join
+        self.none = none
+        self.game = game
+        self.playing = playing
+        self.roles = roles
+        self.func = None
+        self.aftergame = False
+        self.name = cmds[0]
+
+        alias = False
+        self.aliases = []
+        for name in cmds:
+            for func in COMMANDS[name]:
+                if (func.owner_only != owner_only or
+                    func.admin_only != admin_only):
+                    raise ValueError("unmatching protection levels for " + func.name)
+
+            COMMANDS[name].append(self)
+            if alias:
+                self.aliases.append(self)
+            alias = True
+
+    def __call__(self, *args):
+        if self.func is None: # when function is defined; set self.func and call itself again
+            self.func = args[0]
+            self.__doc__ = self.func.__doc__
+            return self
+
+        largs = list(args)
+
+        cli, rawnick, chan, rest = largs
+        nick, mode, user, cloak = parse_nick(rawnick)
+
+        if cloak is None:
+            cloak = ""
+
+        if not self.raw_nick:
+            largs[1] = nick
+
+        if nick == "<console>":
+            return self.func(*largs) # special case; no questions
+
+        if not self.pm and chan == nick:
+            return # PM command, not allowed
+
+        if not self.chan and chan != nick:
+            return # channel command, not allowed
+
+        if chan.startswith("#") and chan != botconfig.CHANNEL and not (admin_only or owner_only):
+            if "" in self.cmds:
+                return # don't have empty commands triggering in other channels
+            for command in self.cmds:
+                if command in botconfig.ALLOWED_ALT_CHANNELS_COMMANDS:
+                    break
+            else:
+                return
+
+        if nick in var.USERS and var.USERS[nick]["account"] != "*":
+            acc = var.USERS[nick]["account"]
+        else:
+            acc = None
+
+        if "" in self.cmds:
+            return self.func(*largs)
+
+        if self.game and var.PHASE not in ("day", "night") + (("join",) if self.join else ()):
+            if chan == nick:
+                pm(cli, nick, "No game is currently running.")
+            else:
+                cli.notice(nick, "No game is currently running.")
+            return
+
+        if ((self.join and self.none and var.PHASE not in ("join", "none")) or
+                     (self.none and not self.join and var.PHASE != "none")):
+            if chan == nick:
+                pm(cli, nick, "Sorry, but the game is already running. Try again next time.")
+            else:
+                cli.notice(nick, "Sorry, but the game is already running. Try again next time.")
+            return
+
+        if self.join and not self.none:
+            if var.PHASE == "none":
+                if chan == nick:
+                    pm(cli, nick, "No game is currently running.")
                 else:
-                    nick = ""
-                    cloak = ""
-                if not raw_nick and len(largs) > 1 and largs[1]:
-                    largs[1] = nick
-                if nick == "<console>":
-                    return f(*largs) # special case; no questions
-                if not pm and largs[2] == nick: # PM command
-                    return
-                if not chan and largs[2] != nick: # channel command
-                    return
-                if largs[2].startswith("#") and largs[2] != botconfig.CHANNEL and not admin_only and not owner_only:
-                    if "" in s:
-                        return # Don't have empty commands triggering in other channels
-                    allowed = False
-                    for cmdname in s:
-                        if cmdname in botconfig.ALLOWED_ALT_CHANNELS_COMMANDS:
-                            allowed = True
-                            break
-                    if not allowed:
-                        return
-                if nick in var.USERS.keys() and var.USERS[nick]["account"] != "*":
-                    acc = var.USERS[nick]["account"]
+                    cli.notice(nick, "No game is currently running.")
+                return
+
+            if var.PHASE != "join" and not self.game:
+                if chan == nick:
+                    pm(cli, nick, "Werewolf is already in play.")
                 else:
-                    acc = None
-                if "" in s:
-                    return f(*largs)
-                if game and var.PHASE not in ("day", "night") + (("join",) if join else ()):
-                    largs[0].notice(nick, "No game is currently running.")
-                    return
-                if ((join and none and var.PHASE not in ("join", "none"))
-                        or (none and not join and var.PHASE != "none")):
-                    largs[0].notice(nick, "Sorry, but the game is already running. Try again next time.")
-                    return
-                if join and not none:
-                    if var.PHASE == "none":
-                        largs[0].notice(nick, "No game is currently running.")
-                        return
-                    if var.PHASE != "join" and not game:
-                        largs[0].notice(nick, "Werewolf is already in play.")
-                        return
-                if playing and (nick not in var.list_players() or nick in var.DISCONNECTED.keys()):
-                    largs[0].notice(nick, "You're not currently playing.")
-                    return
-                if roles:
-                    for role in roles:
-                        if nick in var.ROLES[role]:
-                            break
-                    else:
-                        return
-                if acc:
-                    for pattern in var.DENY_ACCOUNTS.keys():
-                        if fnmatch.fnmatch(acc.lower(), pattern.lower()):
-                            for cmdname in s:
-                                if cmdname in var.DENY_ACCOUNTS[pattern]:
-                                    largs[0].notice(nick, "You do not have permission to use that command.")
-                                    return
-                    for pattern in var.ALLOW_ACCOUNTS.keys():
-                        if fnmatch.fnmatch(acc.lower(), pattern.lower()):
-                            for cmdname in s:
-                                if cmdname in var.ALLOW_ACCOUNTS[pattern]:
-                                    if admin_only or owner_only:
-                                        adminlog(largs[2], rawnick, s[0], largs[3])
-                                    return f(*largs)
-                if not var.ACCOUNTS_ONLY and cloak:
-                    for pattern in var.DENY.keys():
-                        if fnmatch.fnmatch(cloak.lower(), pattern.lower()):
-                            for cmdname in s:
-                                if cmdname in var.DENY[pattern]:
-                                    largs[0].notice(nick, "You do not have permission to use that command.")
-                                    return
-                    for pattern in var.ALLOW.keys():
-                        if fnmatch.fnmatch(cloak.lower(), pattern.lower()):
-                            for cmdname in s:
-                                if cmdname in var.ALLOW[pattern]:
-                                    if admin_only or owner_only:
-                                        adminlog(largs[2], rawnick, s[0], largs[3])
-                                    return f(*largs)  # no questions
-                if owner_only:
-                    if var.is_owner(nick, cloak):
-                        adminlog(largs[2], rawnick, s[0], largs[3])
-                        return f(*largs)
-                    else:
-                        largs[0].notice(nick, "You are not the owner.")
-                        return
-                if admin_only:
-                    if var.is_admin(nick, cloak):
-                        adminlog(largs[2], rawnick, s[0], largs[3])
-                        return f(*largs)
-                    else:
-                        largs[0].notice(nick, "You are not an admin.")
-                        return
-                return f(*largs)
-            alias = False
-            innerf.aliases = []
-            for x in s:
-                if x not in fdict.keys():
-                    fdict[x] = []
-                else:
-                    for fn in fdict[x]:
-                        if (fn.owner_only != owner_only or
-                            fn.admin_only != admin_only):
-                            raise Exception("Command: "+x+" has non-matching protection levels!")
-                fdict[x].append(innerf)
-                if alias:
-                    innerf.aliases.append(x)
-                alias = True
-            innerf.owner_only = owner_only
-            innerf.raw_nick = raw_nick
-            innerf.admin_only = admin_only
-            innerf.chan = chan
-            innerf.pm = pm
-            innerf.none = none
-            innerf.join = join
-            innerf.game = game
-            innerf.playing = playing
-            innerf.roles = roles
-            innerf.hookid = hookid
-            innerf.aftergame = False
-            innerf.__doc__ = f.__doc__
-            return innerf
+                    cli.notice(nick, "Werewolf is already in play.")
+                return
 
-        return dec
+        if self.playing and (nick not in var.list_players() or nick in var.DISCONNECTED):
+            if chan == nick:
+                pm(cli, nick, "You're not currently playing.")
+            else:
+                cli.notice(nick, "You're not currently playing.")
+            return
 
-    return lambda *args, **kwarargs: cmd(*args, **kwarargs) if kwarargs else cmd(*args, **kwargs)
+        if self.roles:
+            for role in self.roles:
+                if nick in var.ROLES[role]:
+                    break
+            else:
+                return
 
+            return self.func(*largs) # don't check restrictions for role commands
 
-def unhook(hdict, hookid):
-    for cmd in list(hdict.keys()):
-        for x in hdict[cmd]:
-            if x.hookid == hookid:
-                hdict[cmd].remove(x)
-        if not hdict[cmd]:
-            del hdict[cmd]
+        if acc:
+            for pattern in var.DENY_ACCOUNTS:
+                if fnmatch.fnmatch(acc.lower(), pattern.lower()):
+                    for command in self.cmds:
+                        if command in var.DENY_ACCOUNTS[pattern]:
+                            if chan == nick:
+                                pm(cli, nick, "You do not have permission to use that command.")
+                            else:
+                                cli.notice(nick, "You do not have permission to use that command.")
+                            return
+
+            for pattern in var.ALLOW_ACCOUNTS:
+                if fnmatch.fnmatch(acc.lower(), pattern.lower()):
+                    for command in self.cmds:
+                        if command in var.ALLOW_ACCOUNTS[pattern]:
+                            if self.admin_only or self.owner_only:
+                                adminlog(chan, rawnick, self.name, rest)
+                            return self.func(*largs)
+
+        if not var.ACCOUNTS_ONLY and cloak:
+            for pattern in var.DENY:
+                if fnmatch.fnmatch(cloak.lower(), pattern.lower()):
+                    for command in self.cmds:
+                        if command in var.DENY[pattern]:
+                            if chan == nick:
+                                pm(cli, nick, "You do not have permission to use that command.")
+                            else:
+                                cli.notice(nick, "You do not have permission to use that command.")
+                            return
+
+            for pattern in var.ALLOW:
+                if fnmatch.fnmatch(cloak.lower(), pattern.lower()):
+                    for command in self.cmds:
+                        if command in var.ALLOW[pattern]:
+                            if self.admin_only or self.owner_only:
+                                adminlog(chan, rawnick, self.name, rest)
+                            return self.func(*largs)
+
+        if self.owner_only:
+            if var.is_owner(nick, cloak):
+                adminlog(chan, rawnick, self.name, rest)
+                return self.func(*largs)
+
+            if chan == nick:
+                pm(cli, nick, "You are not the owner.")
+            else:
+                cli.notice(nick, "You are not the owner.")
+            return
+
+        if self.admin_only:
+            if var.is_admin(nick, cloak):
+                adminlog(chan, rawnick, self.name, rest)
+                return self.func(*largs)
+
+            if chan == nick:
+                pm(cli, nick, "You are not an admin.")
+            else:
+                cli.notice(nick, "You are not an admin.")
+            return
+
+        return self.func(*largs)
+
+class hook:
+    def __init__(self, name, hookid=-1):
+        self.name = name
+        self.hookid = hookid
+        self.func = None
+
+        HOOKS[name].append(self)
+
+    def __call__(self, *args):
+        if self.func is None:
+            self.func = args[0]
+            self.__doc__ = self.func.__doc__
+            return self
+        return self.func(*args)
+
+    @staticmethod
+    def unhook(hookid):
+        for each in list(HOOKS):
+            for inner in list(HOOKS[each]):
+                if inner.hookid == hookid:
+                    HOOKS[each].remove(inner)
+            if not HOOKS[each]:
+                del HOOKS[each]
diff --git a/src/handler.py b/src/handler.py
index bc27169..e1b1701 100644
--- a/src/handler.py
+++ b/src/handler.py
@@ -15,6 +15,7 @@ from src import wolfgame
 log = logger("errors.log")
 alog = logger(None)
 
+hook = decorators.hook
 
 def notify_error(cli, chan, target_logger):
     msg = "An error has occurred and has been logged."
@@ -56,18 +57,17 @@ def on_privmsg(cli, rawnick, chan, msg, notice = False):
     if chan == botconfig.NICK:
         chan = parse_nick(rawnick)[0]
 
-    if "" in wolfgame.COMMANDS.keys():
-        for fn in wolfgame.COMMANDS[""]:
-            try:
-                fn(cli, rawnick, chan, msg)
-            except Exception:
-                if botconfig.DEBUG_MODE:
-                    raise
-                else:
-                    notify_error(cli, chan, log)
+    for fn in decorators.COMMANDS[""]:
+        try:
+            fn(cli, rawnick, chan, msg)
+        except Exception:
+            if botconfig.DEBUG_MODE:
+                raise
+            else:
+                notify_error(cli, chan, log)
 
 
-    for x in set(list(COMMANDS.keys()) + list(wolfgame.COMMANDS.keys())):
+    for x in decorators.COMMANDS:
         if chan != parse_nick(rawnick)[0] and not msg.lower().startswith(botconfig.CMD_CHAR):
             break # channel message but no prefix; ignore
         if msg.lower().startswith(botconfig.CMD_CHAR+x):
@@ -77,7 +77,7 @@ def on_privmsg(cli, rawnick, chan, msg, notice = False):
         else:
             continue
         if not h or h[0] == " ":
-            for fn in COMMANDS.get(x, []) + (wolfgame.COMMANDS.get(x, [])):
+            for fn in decorators.COMMANDS.get(x, []):
                 try:
                     fn(cli, rawnick, chan, h.lstrip())
                 except Exception:
@@ -86,13 +86,13 @@ def on_privmsg(cli, rawnick, chan, msg, notice = False):
                     else:
                         notify_error(cli, chan, log)
 
-    
+
 def unhandled(cli, prefix, cmd, *args):
-    if cmd in set(list(HOOKS.keys()) + list(wolfgame.HOOKS.keys())):
+    if cmd in decorators.HOOKS:
         largs = list(args)
         for i,arg in enumerate(largs):
             if isinstance(arg, bytes): largs[i] = arg.decode('ascii')
-        for fn in HOOKS.get(cmd, []) + wolfgame.HOOKS.get(cmd, []):
+        for fn in decorators.HOOKS.get(cmd, []):
             try:
                 fn(cli, prefix, *largs)
             except Exception as e:
@@ -101,13 +101,6 @@ def unhandled(cli, prefix, cmd, *args):
                 else:
                     notify_error(cli, botconfig.CHANNEL, log)
 
-
-COMMANDS = {}
-HOOKS = {}
-
-cmd = decorators.generate(COMMANDS)
-hook = decorators.generate(HOOKS, raw_nick=True, permissions=False)
-
 def connect_callback(cli):
 
     def prepare_stuff(*args):
@@ -123,7 +116,7 @@ def connect_callback(cli):
 
         cli.cap("REQ", "extended-join")
         cli.cap("REQ", "account-notify")
-        
+
         wolfgame.connect_callback(cli)
 
         cli.nick(botconfig.NICK)  # very important (for regain/release)
@@ -147,7 +140,7 @@ def connect_callback(cli):
         cli.nick(botconfig.NICK+"_")
         cli.user(botconfig.NICK, "")
 
-        decorators.unhook(HOOKS, 239)
+        hook.unhook(HOOKS, 239)
         hook("unavailresource")(mustrelease)
         hook("nicknameinuse")(mustregain)
 
diff --git a/src/wolfgame.py b/src/wolfgame.py
index 71d84bb..f2cce41 100644
--- a/src/wolfgame.py
+++ b/src/wolfgame.py
@@ -49,14 +49,12 @@ debuglog = logger("debug.log", write=False, display=False) # will be True if in
 errlog = logger("errors.log")
 plog = logger(None) #use this instead of print so that logs have timestamps
 
-COMMANDS = {}
-HOOKS = {}
-
 is_admin = var.is_admin
 is_owner = var.is_owner
 
-cmd = decorators.generate(COMMANDS)
-hook = decorators.generate(HOOKS, raw_nick=True, permissions=False)
+cmd = decorators.cmd
+hook = decorators.hook
+COMMANDS = decorators.COMMANDS
 
 # Game Logic Begins:
 
@@ -228,7 +226,7 @@ def connect_callback(cli):
             notify_error(cli, botconfig.CHANNEL, errlog)
 
         # Unhook the WHO hooks
-        decorators.unhook(HOOKS, 295)
+        hook.unhook(295)
 
 
     #bot can be tricked into thinking it's still opped by doing multiple modes at once
@@ -378,6 +376,8 @@ def pm(cli, target, message):  # message either privmsg or notice, depending on
 
     cli.msg(target, message)
 
+decorators.pm = pm
+
 def reset_settings():
     var.CURRENT_GAMEMODE.teardown()
     var.CURRENT_GAMEMODE = var.GAME_MODES["default"][0]()
@@ -898,7 +898,7 @@ def join_timer_handler(cli):
             # I was lucky to catch this in testing, as it requires precise timing
             # it only failed if a join happened while this outer func had started
             var.PINGING_IFS = False
-            decorators.unhook(HOOKS, 387)
+            hook.unhook(387)
             if to_ping:
                 to_ping.sort(key=lambda x: x.lower())
 
@@ -6703,7 +6703,7 @@ def show_admins(cli, nick, chan, rest):
         else:
             cli.msg(chan, msg)
 
-        decorators.unhook(HOOKS, 4)
+        hook.unhook(4)
         var.ADMIN_PINGING = False
 
     if nick == chan:

From f1285d22379d313b9fb1b1224a5c7985c0e57198 Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Wed, 3 Jun 2015 11:09:26 -0400
Subject: [PATCH 2/7] Tweak the decorators to no longer have mangled __call__

---
 src/decorators.py | 24 +++++++++++-------------
 src/handler.py    |  6 +++---
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/decorators.py b/src/decorators.py
index 8774077..e38c22c 100644
--- a/src/decorators.py
+++ b/src/decorators.py
@@ -1,6 +1,3 @@
-# Old, obsolete & original code by jcao219
-# rewritten by Vgr
-
 import fnmatch
 from collections import defaultdict
 
@@ -46,12 +43,12 @@ class cmd:
                 self.aliases.append(self)
             alias = True
 
-    def __call__(self, *args):
-        if self.func is None: # when function is defined; set self.func and call itself again
-            self.func = args[0]
-            self.__doc__ = self.func.__doc__
-            return self
+    def __call__(self, func):
+        self.func = func
+        self.__doc__ = self.func.__doc__
+        return self
 
+    def caller(self, *args):
         largs = list(args)
 
         cli, rawnick, chan, rest = largs
@@ -205,11 +202,12 @@ class hook:
 
         HOOKS[name].append(self)
 
-    def __call__(self, *args):
-        if self.func is None:
-            self.func = args[0]
-            self.__doc__ = self.func.__doc__
-            return self
+    def __call__(self, func):
+        self.func = func
+        self.__doc__ = self.func.__doc__
+        return self
+
+    def caller(self, *args):
         return self.func(*args)
 
     @staticmethod
diff --git a/src/handler.py b/src/handler.py
index e1b1701..319fbf7 100644
--- a/src/handler.py
+++ b/src/handler.py
@@ -59,7 +59,7 @@ def on_privmsg(cli, rawnick, chan, msg, notice = False):
 
     for fn in decorators.COMMANDS[""]:
         try:
-            fn(cli, rawnick, chan, msg)
+            fn.caller(cli, rawnick, chan, msg)
         except Exception:
             if botconfig.DEBUG_MODE:
                 raise
@@ -79,7 +79,7 @@ def on_privmsg(cli, rawnick, chan, msg, notice = False):
         if not h or h[0] == " ":
             for fn in decorators.COMMANDS.get(x, []):
                 try:
-                    fn(cli, rawnick, chan, h.lstrip())
+                    fn.caller(cli, rawnick, chan, h.lstrip())
                 except Exception:
                     if botconfig.DEBUG_MODE:
                         raise
@@ -94,7 +94,7 @@ def unhandled(cli, prefix, cmd, *args):
             if isinstance(arg, bytes): largs[i] = arg.decode('ascii')
         for fn in decorators.HOOKS.get(cmd, []):
             try:
-                fn(cli, prefix, *largs)
+                fn.caller(cli, prefix, *largs)
             except Exception as e:
                 if botconfig.DEBUG_MODE:
                     raise e

From b6211748a15a2f65e3db2a519897e83f8d4ea39a Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Thu, 4 Jun 2015 09:44:34 -0400
Subject: [PATCH 3/7] Add the 'phases' and 'silenced' arguments to the cmd
 decorator

---
 src/decorators.py |  43 +++--------
 src/wolfgame.py   | 192 ++++++++++------------------------------------
 2 files changed, 53 insertions(+), 182 deletions(-)

diff --git a/src/decorators.py b/src/decorators.py
index e38c22c..97ffd1d 100644
--- a/src/decorators.py
+++ b/src/decorators.py
@@ -13,7 +13,7 @@ HOOKS = defaultdict(list)
 
 class cmd:
     def __init__(self, *cmds, raw_nick=False, admin_only=False, owner_only=False,
-                 chan=True, pm=False, join=False, none=False, game=False, playing=False, roles=()):
+                 chan=True, pm=False, playing=False, silenced=False, phases=(), roles=()):
 
         self.cmds = cmds
         self.raw_nick = raw_nick
@@ -21,10 +21,9 @@ class cmd:
         self.owner_only = owner_only
         self.chan = chan
         self.pm = pm
-        self.join = join
-        self.none = none
-        self.game = game
         self.playing = playing
+        self.silenced = silenced
+        self.phases = phases
         self.roles = roles
         self.func = None
         self.aftergame = False
@@ -86,36 +85,9 @@ class cmd:
         if "" in self.cmds:
             return self.func(*largs)
 
-        if self.game and var.PHASE not in ("day", "night") + (("join",) if self.join else ()):
-            if chan == nick:
-                pm(cli, nick, "No game is currently running.")
-            else:
-                cli.notice(nick, "No game is currently running.")
+        if self.phases and var.PHASE not in self.phases:
             return
 
-        if ((self.join and self.none and var.PHASE not in ("join", "none")) or
-                     (self.none and not self.join and var.PHASE != "none")):
-            if chan == nick:
-                pm(cli, nick, "Sorry, but the game is already running. Try again next time.")
-            else:
-                cli.notice(nick, "Sorry, but the game is already running. Try again next time.")
-            return
-
-        if self.join and not self.none:
-            if var.PHASE == "none":
-                if chan == nick:
-                    pm(cli, nick, "No game is currently running.")
-                else:
-                    cli.notice(nick, "No game is currently running.")
-                return
-
-            if var.PHASE != "join" and not self.game:
-                if chan == nick:
-                    pm(cli, nick, "Werewolf is already in play.")
-                else:
-                    cli.notice(nick, "Werewolf is already in play.")
-                return
-
         if self.playing and (nick not in var.list_players() or nick in var.DISCONNECTED):
             if chan == nick:
                 pm(cli, nick, "You're not currently playing.")
@@ -123,6 +95,13 @@ class cmd:
                 cli.notice(nick, "You're not currently playing.")
             return
 
+        if self.silenced and nick in var.SILENCED:
+            if chan == nick:
+                pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
+            else:
+                cli.notice(nick, "You have been silenced, and are unable to use any special powers.")
+            return
+
         if self.roles:
             for role in self.roles:
                 if nick in var.ROLES[role]:
diff --git a/src/wolfgame.py b/src/wolfgame.py
index f2cce41..eaf5d47 100644
--- a/src/wolfgame.py
+++ b/src/wolfgame.py
@@ -909,7 +909,7 @@ def join_timer_handler(cli):
 
         cli.who(botconfig.CHANNEL, "%uhsnfa")
 
-@cmd("join", "j", none=True, join=True)
+@cmd("join", "j", phases=("none", "join"))
 def join(cli, nick, chan, rest):
     """Either starts a new game of Werewolf or joins an existing game that has not started yet."""
     if var.ACCOUNTS_ONLY:
@@ -1067,7 +1067,7 @@ def kill_join(cli, chan):
         var.AFTER_FLASTGAME = None
 
 
-@cmd("fjoin", admin_only=True, none=True, join=True)
+@cmd("fjoin", admin_only=True, phases=("none", "join"))
 def fjoin(cli, nick, chan, rest):
     """Forces someone to join a game."""
     noticed = False
@@ -1103,7 +1103,7 @@ def fjoin(cli, nick, chan, rest):
     if fake:
         cli.msg(chan, "\u0002{0}\u0002 used fjoin and raised the number of players to \u0002{1}\u0002.".format(nick, len(var.list_players())))
 
-@cmd("fleave", "fquit", admin_only=True, join=True, game=True)
+@cmd("fleave", "fquit", admin_only=True, phases=("join", "day", "night"))
 def fleave(cli, nick, chan, rest):
     """Forces someone to leave the game."""
     if chan != botconfig.CHANNEL:
@@ -1135,7 +1135,7 @@ def fleave(cli, nick, chan, rest):
         del_player(cli, a, death_triggers = False)
 
 
-@cmd("fstart", admin_only=True, join=True)
+@cmd("fstart", admin_only=True, phases=("join",))
 def fstart(cli, nick, chan, rest):
     """Forces the game to start immediately."""
     cli.msg(botconfig.CHANNEL, "\u0002{0}\u0002 has forced the game to start.".format(nick))
@@ -1181,7 +1181,7 @@ def on_account(cli, rnick, acc):
                         if nick in var.DCED_PLAYERS.keys():
                             var.PLAYERS[nick] = var.DCED_PLAYERS.pop(nick)
 
-@cmd("stats", "players", pm=True, game=True, join=True)
+@cmd("stats", "players", pm=True, phases=("join", "day", "night"))
 def stats(cli, nick, chan, rest):
     """Displays the player statistics."""
 
@@ -1541,7 +1541,7 @@ def chk_decision(cli, force = ""):
                 transition_night(cli)
             break
 
-@cmd("votes", pm=True, game=True, join=True)
+@cmd("votes", pm=True, phases=("join", "day", "night"))
 def show_votes(cli, nick, chan, rest):
     """Displays the voting statistics."""
 
@@ -2542,14 +2542,10 @@ def on_join(cli, raw_nick, chan, acc="*", rname=""):
         cli.msg("ChanServ", "op " + chan)
 
 
-@cmd("goat", game=True, playing=True)
+@cmd("goat", playing=True, phases=("day",))
 def goat(cli, nick, chan, rest):
     """Use a goat to interact with anyone in the channel during the day."""
 
-    if var.PHASE != "day":
-        cli.notice(nick, "You can only do that in the day.")
-        return
-
     if var.GOATED and nick not in var.SPECIAL_ROLES["goat herder"]:
         cli.notice(nick, "This can only be done once per day.")
         return
@@ -2908,7 +2904,7 @@ hook("quit")(lambda cli, nick, *rest: leave(cli, "quit", nick, rest[0]))
 hook("kick")(lambda cli, nick, *rest: leave(cli, "kick", rest[1], rest[0]))
 
 
-@cmd("quit", "leave", join=True, game=True, playing=True)
+@cmd("quit", "leave", playing=True, phases=("join", "day", "night"))
 def leave_game(cli, nick, chan, rest):
     """Quits the game."""
     if var.PHASE == "join":
@@ -3564,7 +3560,7 @@ def chk_nightdone(cli):
         if var.PHASE == "night":  # Double check
             transition_day(cli)
 
-@cmd("nolynch", "nl", "novote", "nv", "abstain", "abs", game=True, playing=True)
+@cmd("nolynch", "nl", "novote", "nv", "abstain", "abs", playing=True, phases=("day",))
 def no_lynch(cli, nick, chan, rest):
     """Allows you to abstain from voting for the day."""
     if chan == botconfig.CHANNEL:
@@ -3577,9 +3573,6 @@ def no_lynch(cli, nick, chan, rest):
         elif var.LIMIT_ABSTAIN and var.FIRST_DAY:
             cli.notice(nick, "The village may not abstain on the first day.")
             return
-        elif var.PHASE != "day":
-            cli.notice(nick, "Lynching is only during the day. Please wait patiently for morning.")
-            return
         elif nick in var.WOUNDED:
             cli.msg(chan, "{0}: You are wounded and resting, thus you are unable to vote for the day.".format(nick))
             return
@@ -3596,7 +3589,7 @@ def no_lynch(cli, nick, chan, rest):
         chk_decision(cli)
         return
 
-@cmd("lynch", game=True, playing=True, pm=True)
+@cmd("lynch", playing=True, pm=True, phases=("day",))
 def lynch(cli, nick, chan, rest):
     """Use this to vote for a candidate to be lynched."""
     if not rest:
@@ -3607,10 +3600,6 @@ def lynch(cli, nick, chan, rest):
 
     rest = re.split(" +",rest)[0].strip()
 
-    if var.PHASE != "day":
-        cli.notice(nick, ("Lynching is only allowed during the day. "+
-                          "Please wait patiently for morning."))
-        return
     if nick in var.WOUNDED:
         cli.msg(chan, ("{0}: You are wounded and resting, "+
                       "thus you are unable to vote for the day.").format(nick))
@@ -3944,11 +3933,11 @@ def check_exchange(cli, actor, nick):
         return True
     return False
 
-@cmd("retract", pm=True, game=True, playing=True)
+@cmd("retract", pm=True, playing=True, phases=("day", "night"))
 def retract(cli, nick, chan, rest):
     """Takes back your vote during the day (for whom to lynch)."""
 
-    if not chan in (botconfig.CHANNEL, nick):
+    if chan not in (botconfig.CHANNEL, nick):
         return
 
     if chan == nick: # PM, use different code
@@ -3956,7 +3945,6 @@ def retract(cli, nick, chan, rest):
         if role not in ("wolf", "werecrow", "alpha wolf", "werekitten", "hunter") and nick not in var.VENGEFUL_GHOSTS.keys():
             return
         if var.PHASE != "night":
-            pm(cli, nick, "You may only retract at night.")
             return
         if role == "werecrow":  # Check if already observed
             if var.OBSERVED.get(nick):
@@ -3986,8 +3974,6 @@ def retract(cli, nick, chan, rest):
         return
 
     if var.PHASE != "day":
-        cli.notice(nick, ("Lynching is only allowed during the day. "+
-                          "Please wait patiently for morning."))
         return
     if nick in var.NO_LYNCH:
         var.NO_LYNCH.remove(nick)
@@ -4007,17 +3993,13 @@ def retract(cli, nick, chan, rest):
     else:
         cli.notice(nick, "You haven't voted yet.")
 
-@cmd("shoot", game=True, playing=True)
+@cmd("shoot", playing=True, silenced=True, phases=("day",))
 def shoot(cli, nick, chan, rest):
     """Use this to fire off a bullet at someone in the day if you have bullets."""
 
     if chan != botconfig.CHANNEL:
         return
 
-    if var.PHASE != "day":
-        cli.notice(nick, ("Shooting is only allowed during the day. "+
-                          "Please wait patiently for morning."))
-        return
     if nick not in var.GUNNERS.keys() and nick not in var.WOLF_GUNNERS.keys():
         cli.notice(nick, "You don't have a gun.")
         return
@@ -4026,9 +4008,6 @@ def shoot(cli, nick, chan, rest):
           nick in var.WOLF_GUNNERS.keys() and not var.WOLF_GUNNERS[nick])):
         cli.notice(nick, "You don't have any more bullets.")
         return
-    elif nick in var.SILENCED:
-        cli.notice(nick, "You have been silenced, and are unable to use any special powers.")
-        return
     victim = get_victim(cli, nick, re.split(" +",rest)[0], True)
     if not victim:
         return
@@ -4112,7 +4091,7 @@ def shoot(cli, nick, chan, rest):
 
 
 
-@cmd("kill", chan=False, pm=True, game=True)
+@cmd("kill", chan=False, pm=True, phases=("night",))
 def kill(cli, nick, chan, rest):
     """Kill a player. Behaviour varies depending on your role."""
     if (nick not in var.VENGEFUL_GHOSTS.keys() and nick not in var.list_players()) or nick in var.DISCONNECTED.keys():
@@ -4131,9 +4110,6 @@ def kill(cli, nick, chan, rest):
     if nick in var.VENGEFUL_GHOSTS.keys() and var.VENGEFUL_GHOSTS[nick][0] == "!":
         # ghost was driven away by retribution
         return
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only kill people at night.")
-        return
     if role == "hunter" and nick in var.HUNTERS and nick not in var.OTHER_KILLS:
         # they are a hunter and did not kill this night (if they killed this night, this allows them to switch)
         pm(cli, nick, "You have already killed someone this game.")
@@ -4234,15 +4210,9 @@ def kill(cli, nick, chan, rest):
         debuglog("{0} ({1}) KILL : {2} ({3})".format(nick, role, victim2, var.get_role(victim2)))
     chk_nightdone(cli)
 
-@cmd("guard", "protect", "save", chan=False, pm=True, game=False, playing=True, roles=("bodyguard", "guardian angel"))
+@cmd("guard", "protect", "save", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("bodyguard", "guardian angel"))
 def guard(cli, nick, chan, rest):
     """Guard a player, preventing them from being targetted that night."""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only protect people at night.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     if var.GUARDED.get(nick):
         pm(cli, nick, "You are already protecting someone tonight.")
         return
@@ -4278,19 +4248,10 @@ def guard(cli, nick, chan, rest):
 
 
 
-@cmd("observe", chan=False, pm=True, game=True, playing=True, roles=("werecrow", "sorcerer"))
+@cmd("observe", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("werecrow", "sorcerer"))
 def observe(cli, nick, chan, rest):
     """Observe a player to obtain various information."""
     role = var.get_role(nick)
-    if var.PHASE != "night":
-        if role == "werecrow":
-            pm(cli, nick, "You may only transform into a crow at night.")
-        else:
-            pm(cli, nick, "You may only observe at night.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
     if not victim:
         return
@@ -4337,15 +4298,9 @@ def observe(cli, nick, chan, rest):
     debuglog("{0} ({1}) OBSERVE: {2} ({3})".format(nick, role, victim, var.get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("id", chan=False, pm=True, game=True, playing=True, roles=("detective",))
+@cmd("id", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("detective",))
 def investigate(cli, nick, chan, rest):
     """Investigate a player to determine their exact role."""
-    if var.PHASE != "day":
-        pm(cli, nick, "You may only investigate people during the day.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     if nick in var.INVESTIGATED:
         pm(cli, nick, "You may only investigate one person per round.")
         return
@@ -4372,15 +4327,9 @@ def investigate(cli, nick, chan, rest):
                             "that \u0002{0}\u0002 is the detective!").format(nick))
         debuglog("{0} ({1}) PAPER DROP".format(nick, var.get_role(nick)))
 
-@cmd("visit", chan=False, pm=True, game=True, playing=True, roles=("harlot",))
+@cmd("visit", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("harlot",))
 def hvisit(cli, nick, chan, rest):
     """Visit a player. You will die if you visit a wolf or a target of the wolves."""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only visit someone at night.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     if var.HVISITED.get(nick):
         pm(cli, nick, ("You are already spending the night "+
                       "with \u0002{0}\u0002.").format(var.HVISITED[nick]))
@@ -4408,16 +4357,10 @@ def hvisit(cli, nick, chan, rest):
 def is_fake_nick(who):
     return re.search(r"^[0-9]+$", who)
 
-@cmd("see", chan=False, pm=True, game=True, playing=True, roles=("seer", "oracle", "augur"))
+@cmd("see", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("seer", "oracle", "augur"))
 def see(cli, nick, chan, rest):
     """Use your paranormal powers to determine the role or alignment of a player."""
     role = var.get_role(nick)
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only have visions at night.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     if nick in var.SEEN:
         pm(cli, nick, "You may only have one vision per round.")
         return
@@ -4467,7 +4410,7 @@ def see(cli, nick, chan, rest):
     var.SEEN.append(nick)
     chk_nightdone(cli)
 
-@cmd("give", chan=False, pm=True, game=True, playing=True, roles=var.TOTEM_ORDER+("doctor",))
+@cmd("give", chan=False, pm=True, playing=True, silenced=True, phases=("day", "night"), roles=var.TOTEM_ORDER+("doctor",))
 def give(cli, nick, chan, rest):
     """Give a totem or immunization to a player."""
     role = var.get_role(nick)
@@ -4476,15 +4419,9 @@ def give(cli, nick, chan, rest):
     elif role == "doctor":
         immunize(cli, nick, chan, rest)
 
-@cmd("totem", chan=False, pm=True, game=True, playing=True, roles=var.TOTEM_ORDER)
+@cmd("totem", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=var.TOTEM_ORDER)
 def totem(cli, nick, chan, rest):
     """Give a totem to a player."""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only give totems at night.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     if nick in var.SHAMANS:
         pm(cli, nick, "You have already given out your totem this round.")
         return
@@ -4553,15 +4490,9 @@ def totem(cli, nick, chan, rest):
     debuglog("{0} ({1}) TOTEM: {2} ({3})".format(nick, role, victim, totem))
     chk_nightdone(cli)
 
-@cmd("immunize", "immunise", chan=False, pm=True, game=True, playing=True, roles=("doctor",))
+@cmd("immunize", "immunise", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("doctor",))
 def immunize(cli, nick, chan, rest):
     """Immunize a player, preventing them from turning into a wolf."""
-    if var.PHASE != "day":
-        pm(cli, nick, "You may only immunize people during the day.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     if nick in var.DOCTORS and var.DOCTORS[nick] == 0:
         pm(cli, nick, "You have run out of immunizations.")
         return
@@ -4622,18 +4553,12 @@ def get_bitten_message(nick):
                    "who or what the pursuer was, you woke with a start.")
     return message
 
-@cmd("bite", chan=False, pm=True, game=True, playing=True, roles=("alpha wolf",))
+@cmd("bite", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("alpha wolf",))
 def bite_cmd(cli, nick, chan, rest):
     """Bite a player, turning them into a wolf after a certain number of nights."""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only bite at night.")
-        return
     if nick in var.ALPHA_WOLVES and nick not in var.BITE_PREFERENCES:
         pm(cli, nick, "You have already bitten someone this game.")
         return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     if not var.ALPHA_ENABLED:
         pm(cli, nick, "You may only bite someone after another wolf has died during the day.")
         return
@@ -4667,16 +4592,9 @@ def bite_cmd(cli, nick, chan, rest):
         pm(cli, nick, "You have chosen to bite tonight. Whomever the wolves select to be killed tonight will be bitten instead.")
     debuglog("{0} ({1}) BITE: {2} ({3})".format(nick, var.get_role(nick), victim if victim else "wolves' target", vrole if vrole else "unknown"))
 
-@cmd("pass", chan=False, pm=True, game=True, playing=True, roles=("hunter",))
+@cmd("pass", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hunter",))
 def pass_cmd(cli, nick, chan, rest):
     """Decline to kill someone for that night."""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only pass at night.")
-        return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
-
     if nick in var.OTHER_KILLS.keys():
         del var.OTHER_KILLS[nick]
         var.HUNTERS.remove(nick)
@@ -4687,11 +4605,10 @@ def pass_cmd(cli, nick, chan, rest):
     debuglog("{0} ({1}) PASS".format(nick, var.get_role(nick)))
     chk_nightdone(cli)
 
-@cmd("choose", "match", chan=False, pm=True, game=True, playing=True, roles=("matchmaker",))
+@cmd("choose", "match", chan=False, pm=True, playing=True, phases=("night",), roles=("matchmaker",))
 def choose(cli, nick, chan, rest):
     """Select two players to fall in love. You may select yourself as one of the lovers."""
-    if var.PHASE != "night" or not var.FIRST_NIGHT:
-        pm(cli, nick, "You may only choose lovers during the first night.")
+    if not var.FIRST_NIGHT:
         return
     if nick in var.MATCHMAKERS:
         pm(cli, nick, "You have already chosen lovers.")
@@ -4753,18 +4670,12 @@ def choose(cli, nick, chan, rest):
     debuglog("{0} ({1}) MATCH: {2} ({3}) + {4} ({5})".format(nick, var.get_role(nick), victim, var.get_role(victim), victim2, var.get_role(victim2)))
     chk_nightdone(cli)
 
-@cmd("target", chan=False, pm=True, game=True, playing=True, roles=("assassin",))
+@cmd("target", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("assassin",))
 def target(cli, nick, chan, rest):
     """Pick a player as your target, killing them if you die."""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only target people at night.")
-        return
     if nick in var.TARGETED and var.TARGETED[nick] != None:
         pm(cli, nick, "You have already chosen a target.")
         return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
     if not victim:
         return
@@ -4781,18 +4692,12 @@ def target(cli, nick, chan, rest):
     debuglog("{0} ({1}-{2}) TARGET: {3} ({4})".format(nick, "-".join(var.get_templates(nick)), var.get_role(nick), victim, var.get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("hex", chan=False, pm=True, game=True, playing=True, roles=("hag",))
+@cmd("hex", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hag",))
 def hex_target(cli, nick, chan, rest):
     """Hex someone, preventing them from acting the next day and night."""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only hex at night.")
-        return
     if nick in var.HEXED:
         pm(cli, nick, "You have already hexed someone tonight.")
         return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
     if not victim:
         return
@@ -4821,19 +4726,13 @@ def hex_target(cli, nick, chan, rest):
     debuglog("{0} ({1}) HEX: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("curse", chan=False, pm=True, game=True, playing=True, roles=("warlock",))
+@cmd("curse", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("warlock",))
 def curse(cli, nick, chan, rest):
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only curse at night.")
-        return
     if nick in var.CURSED:
         # CONSIDER: this happens even if they choose to not curse, should maybe let them
         # pick again in that case instead of locking them into doing nothing.
         pm(cli, nick, "You have already cursed someone tonight.")
         return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
-        return
     victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
     if not victim:
         return
@@ -4868,11 +4767,10 @@ def curse(cli, nick, chan, rest):
     debuglog("{0} ({1}) CURSE: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("clone", chan=False, pm=True, game=True, playing=True, roles=("clone",))
+@cmd("clone", chan=False, pm=True, playing=True, phases=("night",), roles=("clone",))
 def clone(cli, nick, chan, rest):
     """Clone another player. You will turn into their role if they die."""
-    if var.PHASE != "night" or not var.FIRST_NIGHT:
-        pm(cli, nick, "You may only clone someone during the first night.")
+    if not var.FIRST_NIGHT:
         return
     if nick in var.CLONED.keys():
         pm(cli, nick, "You have already chosen to clone someone.")
@@ -4895,18 +4793,12 @@ def clone(cli, nick, chan, rest):
     debuglog("{0} ({1}) CLONE: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("charm", chan=False, pm=True, game=True, playing=True, roles=("piper",))
+@cmd("charm", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("piper",))
 def charm(cli, nick, chan, rest):
     """Charm a player, slowly leading to your win!"""
-    if var.PHASE != "night":
-        pm(cli, nick, "You may only charm other players during the night.")
-        return
     if nick in var.CHARMERS:
         pm(cli, nick, "You have already charmed players for tonight.")
         return
-    if nick in var.SILENCED:
-        pm(cli, nick, "You are silenced, and are unable to use any special powers.")
-        return
 
     pieces = re.split(" +",rest)
     victim = pieces[0]
@@ -5783,7 +5675,7 @@ def cgamemode(cli, arg):
         cli.msg(chan, "Mode \u0002{0}\u0002 not found.".format(modeargs[0]))
 
 
-@cmd("start", join=True)
+@cmd("start", phases=("join",))
 def fstart(cli, nick, chan, rest):
     """Starts a game of Werewolf."""
     start(cli, nick, chan)
@@ -6449,7 +6341,7 @@ def fdeny(cli, nick, chan, rest):
     """Deny someone from using a command."""
     allow_deny(cli, nick, chan, rest, "deny")
 
-@cmd("wait", "w", join=True, playing=True)
+@cmd("wait", "w", playing=True, phases=("join",))
 def wait(cli, nick, chan, rest):
     """Increases the wait time until !start can be used."""
     pl = var.list_players()
@@ -6482,7 +6374,7 @@ def wait(cli, nick, chan, rest):
                       "{1} seconds.").format(nick, var.EXTRA_WAIT))
 
 
-@cmd("fwait", admin_only=True, join=True)
+@cmd("fwait", admin_only=True, phases=("join",))
 def fwait(cli, nick, chan, rest):
     """Forces an increase (or decrease) in wait time. Can be used with a number of seconds to wait."""
 
@@ -6509,7 +6401,7 @@ def fwait(cli, nick, chan, rest):
                                         "s" if extra != 1 else ""))
 
 
-@cmd("fstop", admin_only=True, game=True, join=True)
+@cmd("fstop", admin_only=True, phases=("join", "day", "night"))
 def reset_game(cli, nick, chan, rest):
     """Forces the game to stop."""
     cli.msg(botconfig.CHANNEL, "\u0002{0}\u0002 has forced the game to stop.".format(nick))
@@ -6742,7 +6634,7 @@ def pony(cli, nick, chan, rest):
     cmsg = "The pony lands on \2{0}\2.".format(pony)
     cli.msg(chan, cmsg)
 
-@cmd("time", pm=True, game=True, join=True)
+@cmd("time", pm=True, phases=("join", "day", "night"))
 def timeleft(cli, nick, chan, rest):
     """Returns the time left until the next day/night transition."""
 
@@ -6866,7 +6758,7 @@ def listroles(cli, nick, chan, rest):
     else:
         cli.msg(chan, txt)
 
-@cmd("myrole", pm=True, game=True)
+@cmd("myrole", pm=True, phases=("day", "night"))
 def myrole(cli, nick, chan, rest):
     """Reminds you of your current role."""
 
@@ -7117,7 +7009,7 @@ def my_stats(cli, nick, chan, rest):
     rest = rest.split()
     player_stats(cli, nick, chan, " ".join([nick] + rest))
 
-@cmd("game", join=True, playing=True)
+@cmd("game", playing=True, phases=("join",))
 def game(cli, nick, chan, rest):
     """Vote for a game mode to be picked."""
     if rest:
@@ -7152,7 +7044,7 @@ def game_help(args=""):
 game.__doc__ = game_help
 
 
-@cmd("vote", "v", pm=True)
+@cmd("vote", "v", pm=True, phases=("join", "day"))
 def vote(cli, nick, chan, rest):
     """Vote for a game mode if no game is running, or for a player to be lynched."""
     if rest:
@@ -7265,7 +7157,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
         except Exception as e:
             cli.msg(chan, str(type(e))+":"+str(e))
 
-    @cmd("revealroles", admin_only=True, pm=True, game=True)
+    @cmd("revealroles", admin_only=True, pm=True, phases=("day", "night"))
     def revealroles(cli, nick, chan, rest):
         """Reveal role information."""
         def is_authorized():
@@ -7371,7 +7263,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
                 cli.notice(nick, var.break_long_message(output, " | "))
 
 
-    @cmd("fgame", admin_only=True, raw_nick=True, join=True)
+    @cmd("fgame", admin_only=True, raw_nick=True, phases=("join",))
     def fgame(cli, nick, chan, rest):
         """Force a certain game mode to be picked. Disable voting for game modes upon use."""
         nick = parse_nick(nick)[0]

From dcc23ce554282f95544bca5a33065b54de910be6 Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Thu, 4 Jun 2015 09:45:31 -0400
Subject: [PATCH 4/7] Modify how permissions are checked

---
 src/decorators.py | 52 +++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/decorators.py b/src/decorators.py
index 97ffd1d..3dd5d06 100644
--- a/src/decorators.py
+++ b/src/decorators.py
@@ -111,6 +111,24 @@ class cmd:
 
             return self.func(*largs) # don't check restrictions for role commands
 
+        if self.owner_only:
+            if var.is_owner(nick, cloak):
+                adminlog(chan, rawnick, self.name, rest)
+                return self.func(*largs)
+
+            if chan == nick:
+                pm(cli, nick, "You are not the owner.")
+            else:
+                cli.notice(nick, "You are not the owner.")
+            return
+
+        if not self.admin_only:
+            return self.func(*largs)
+
+        if var.is_admin(nick, cloak):
+            adminlog(chan, rawnick, self.name, rest)
+            return self.func(*largs)
+
         if acc:
             for pattern in var.DENY_ACCOUNTS:
                 if fnmatch.fnmatch(acc.lower(), pattern.lower()):
@@ -126,8 +144,7 @@ class cmd:
                 if fnmatch.fnmatch(acc.lower(), pattern.lower()):
                     for command in self.cmds:
                         if command in var.ALLOW_ACCOUNTS[pattern]:
-                            if self.admin_only or self.owner_only:
-                                adminlog(chan, rawnick, self.name, rest)
+                            adminlog(chan, rawnick, self.name, rest)
                             return self.func(*largs)
 
         if not var.ACCOUNTS_ONLY and cloak:
@@ -145,33 +162,14 @@ class cmd:
                 if fnmatch.fnmatch(cloak.lower(), pattern.lower()):
                     for command in self.cmds:
                         if command in var.ALLOW[pattern]:
-                            if self.admin_only or self.owner_only:
-                                adminlog(chan, rawnick, self.name, rest)
+                            adminlog(chan, rawnick, self.name, rest)
                             return self.func(*largs)
 
-        if self.owner_only:
-            if var.is_owner(nick, cloak):
-                adminlog(chan, rawnick, self.name, rest)
-                return self.func(*largs)
-
-            if chan == nick:
-                pm(cli, nick, "You are not the owner.")
-            else:
-                cli.notice(nick, "You are not the owner.")
-            return
-
-        if self.admin_only:
-            if var.is_admin(nick, cloak):
-                adminlog(chan, rawnick, self.name, rest)
-                return self.func(*largs)
-
-            if chan == nick:
-                pm(cli, nick, "You are not an admin.")
-            else:
-                cli.notice(nick, "You are not an admin.")
-            return
-
-        return self.func(*largs)
+        if chan == nick:
+            pm(cli, nick, "You are not an admin.")
+        else:
+            cli.notice(nick, "You are not an admin.")
+        return
 
 class hook:
     def __init__(self, name, hookid=-1):

From 49f0ba220b7cbc9efe8870e59ff6a99070d48ab2 Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Thu, 4 Jun 2015 10:50:10 -0400
Subject: [PATCH 5/7] Modify all commands call to properly call the commands

---
 src/decorators.py |  3 ---
 src/wolfgame.py   | 43 +++++++++++++++++++++----------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/decorators.py b/src/decorators.py
index 3dd5d06..a373f94 100644
--- a/src/decorators.py
+++ b/src/decorators.py
@@ -59,9 +59,6 @@ class cmd:
         if not self.raw_nick:
             largs[1] = nick
 
-        if nick == "<console>":
-            return self.func(*largs) # special case; no questions
-
         if not self.pm and chan == nick:
             return # PM command, not allowed
 
diff --git a/src/wolfgame.py b/src/wolfgame.py
index eaf5d47..dd2e6d8 100644
--- a/src/wolfgame.py
+++ b/src/wolfgame.py
@@ -135,12 +135,12 @@ def connect_callback(cli):
 
     def sighandler(signum, frame):
         if signum in (signal.SIGINT, signal.SIGTERM):
-            forced_exit(cli, "<console>", botconfig.CHANNEL, "")
+            forced_exit.func(cli, "<console>", botconfig.CHANNEL, "")
         elif signum == SIGUSR1:
-            restart_program(cli, "<console>", botconfig.CHANNEL, "")
+            restart_program.func(cli, "<console>", botconfig.CHANNEL, "")
         elif signum == SIGUSR2:
             plog("Scheduling aftergame restart")
-            aftergame(cli, "<console>", botconfig.CHANNEL, "frestart")
+            aftergame.func(cli, "<console>", botconfig.CHANNEL, "frestart")
 
     signal.signal(signal.SIGINT, sighandler)
     signal.signal(signal.SIGTERM, sighandler)
@@ -3593,7 +3593,7 @@ def no_lynch(cli, nick, chan, rest):
 def lynch(cli, nick, chan, rest):
     """Use this to vote for a candidate to be lynched."""
     if not rest:
-        show_votes(cli, nick, chan, rest)
+        show_votes.caller(cli, nick, chan, rest)
         return
     if chan != botconfig.CHANNEL:
         return
@@ -4415,9 +4415,9 @@ def give(cli, nick, chan, rest):
     """Give a totem or immunization to a player."""
     role = var.get_role(nick)
     if role in var.TOTEM_ORDER:
-        totem(cli, nick, chan, rest)
+        totem.caller(cli, nick, chan, rest)
     elif role == "doctor":
-        immunize(cli, nick, chan, rest)
+        immunize.caller(cli, nick, chan, rest)
 
 @cmd("totem", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=var.TOTEM_ORDER)
 def totem(cli, nick, chan, rest):
@@ -4567,7 +4567,7 @@ def bite_cmd(cli, nick, chan, rest):
     vrole = None
     # also mark the victim as the kill target
     if victim:
-        kill(cli, nick, chan, rest)
+        kill.caller(cli, nick, chan, rest)
 
     if var.ANGRY_WOLVES:
         if not victim:
@@ -5777,11 +5777,11 @@ def start(cli, nick, chan, forced = False, restart = ""):
 
     if var.ADMIN_TO_PING and not restart:
         if "join" in COMMANDS.keys():
-            COMMANDS["join"] = [lambda *spam: cli.msg(chan, "This command has been disabled by an admin.")]
+            COMMANDS["join"].caller = [lambda *spam: cli.msg(chan, "This command has been disabled by an admin.")]
         if "j" in COMMANDS.keys():
-            COMMANDS["j"] = [lambda *spam: cli.msg(chan, "This command has been disabled by an admin.")]
+            COMMANDS["j"].caller = [lambda *spam: cli.msg(chan, "This command has been disabled by an admin.")]
         if "start" in COMMANDS.keys():
-            COMMANDS["start"] = [lambda *spam: cli.msg(chan, "This command has been disabled by an admin.")]
+            COMMANDS["start"].caller = [lambda *spam: cli.msg(chan, "This command has been disabled by an admin.")]
 
     if not restart: # will already be stored if restarting
         var.ALL_PLAYERS = copy.copy(var.ROLES["person"])
@@ -6001,7 +6001,7 @@ def start(cli, nick, chan, forced = False, restart = ""):
 @hook("error")
 def on_error(cli, pfx, msg):
     if msg.endswith("(Excess Flood)"):
-        restart_program(cli, "excess flood", "")
+        restart_program.func(cli, "excess flood", "")
     elif msg.startswith("Closing Link:"):
         raise SystemExit
 
@@ -6847,7 +6847,7 @@ def aftergame(cli, rawnick, chan, rest):
         def do_action():
             for fn in COMMANDS[cmd]:
                 fn.aftergame = True
-                fn(cli, rawnick, botconfig.CHANNEL if fn.chan else nick, " ".join(rst))
+                fn.caller(cli, rawnick, botconfig.CHANNEL if fn.chan else nick, " ".join(rst))
                 fn.aftergame = False
     else:
         cli.notice(nick, "That command was not found.")
@@ -6898,7 +6898,7 @@ def flastgame(cli, rawnick, chan, rest):
     var.ADMIN_TO_PING = nick
 
     if rest.strip():
-        aftergame(cli, rawnick, botconfig.CHANNEL, rest)
+        aftergame.func(cli, rawnick, botconfig.CHANNEL, rest)
 
 @cmd("gamestats", "gstats", pm=True)
 def game_stats(cli, nick, chan, rest):
@@ -7007,7 +7007,7 @@ def player_stats(cli, nick, chan, rest):
 def my_stats(cli, nick, chan, rest):
     """Get your own stats."""
     rest = rest.split()
-    player_stats(cli, nick, chan, " ".join([nick] + rest))
+    player_stats.func(cli, nick, chan, " ".join([nick] + rest))
 
 @cmd("game", playing=True, phases=("join",))
 def game(cli, nick, chan, rest):
@@ -7049,11 +7049,11 @@ def vote(cli, nick, chan, rest):
     """Vote for a game mode if no game is running, or for a player to be lynched."""
     if rest:
         if var.PHASE == "join" and chan != nick:
-            return game(cli, nick, chan, rest)
+            return game.caller(cli, nick, chan, rest)
         else:
-            return lynch(cli, nick, chan, rest)
+            return lynch.caller(cli, nick, chan, rest)
     else:
-        return show_votes(cli, nick, chan, rest)
+        return show_votes.caller(cli, nick, chan, rest)
 
 @cmd("fpull", admin_only=True, pm=True)
 def fpull(cli, nick, chan, rest):
@@ -7186,7 +7186,6 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
                 pm(cli, nick, "You are not allowed to use that command right now.")
             else:
                 cli.notice(nick, "You are not allowed to use that command right now.")
-
             return
 
         output = []
@@ -7343,9 +7342,9 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
                     continue
                 for user in who:
                     if fn.chan:
-                        fn(cli, user, chan, " ".join(rst))
+                        fn.caller(cli, user, chan, " ".join(rst))
                     else:
-                        fn(cli, user, user, " ".join(rst))
+                        fn.caller(cli, user, user, " ".join(rst))
             cli.msg(chan, "Operation successful.")
         else:
             cli.msg(chan, "That command was not found.")
@@ -7383,9 +7382,9 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
                     continue
                 for user in tgt[:]:
                     if fn.chan:
-                        fn(cli, user, chan, " ".join(rst))
+                        fn.caller(cli, user, chan, " ".join(rst))
                     else:
-                        fn(cli, user, user, " ".join(rst))
+                        fn.caller(cli, user, user, " ".join(rst))
             cli.msg(chan, "Operation successful.")
         else:
             cli.msg(chan, "That command was not found.")

From ee97d6f45e267cc26e5a8d49399ac1c0e0c4e3e1 Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Thu, 4 Jun 2015 10:55:06 -0400
Subject: [PATCH 6/7] Fix duplicate function name

---
 src/wolfgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wolfgame.py b/src/wolfgame.py
index dd2e6d8..dac7577 100644
--- a/src/wolfgame.py
+++ b/src/wolfgame.py
@@ -5676,7 +5676,7 @@ def cgamemode(cli, arg):
 
 
 @cmd("start", phases=("join",))
-def fstart(cli, nick, chan, rest):
+def start_cmd(cli, nick, chan, rest):
     """Starts a game of Werewolf."""
     start(cli, nick, chan)
 

From 4382d9100870958c72f1478047beea802579ae97 Mon Sep 17 00:00:00 2001
From: "Vgr E.Barry" <vgr255@live.ca>
Date: Thu, 4 Jun 2015 10:55:53 -0400
Subject: [PATCH 7/7] Modify hook handling

---
 src/decorators.py | 3 ---
 src/handler.py    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/decorators.py b/src/decorators.py
index a373f94..d4cd46f 100644
--- a/src/decorators.py
+++ b/src/decorators.py
@@ -181,9 +181,6 @@ class hook:
         self.__doc__ = self.func.__doc__
         return self
 
-    def caller(self, *args):
-        return self.func(*args)
-
     @staticmethod
     def unhook(hookid):
         for each in list(HOOKS):
diff --git a/src/handler.py b/src/handler.py
index 319fbf7..e0d70c4 100644
--- a/src/handler.py
+++ b/src/handler.py
@@ -94,7 +94,7 @@ def unhandled(cli, prefix, cmd, *args):
             if isinstance(arg, bytes): largs[i] = arg.decode('ascii')
         for fn in decorators.HOOKS.get(cmd, []):
             try:
-                fn.caller(cli, prefix, *largs)
+                fn.func(cli, prefix, *largs)
             except Exception as e:
                 if botconfig.DEBUG_MODE:
                     raise e