Revert old_api cmd change

Causing way too many bugs, need to use a more sane method of breaking
the cmd API, and only do so when it's actually ready to go. My
personal preference is to make the new API use @command instead of @cmd.

This reverts commits c90d35e6c0a9ba96692e9d73bbe27efca405d542 and 5f5966a8b49e5214c82d806ac43a2553754fdee6.

src/decorators.py

@@ -184,7 +184,7 @@ class handle_error:
 class cmd:
     def __init__(self, *cmds, raw_nick=False, flag=None, owner_only=False,
                  chan=True, pm=False, playing=False, silenced=False,
-                 phases=(), roles=(), nicks=None, old_api=True):
+                 phases=(), roles=(), nicks=None):
 
         self.cmds = cmds
         self.raw_nick = raw_nick
@@ -197,7 +197,6 @@ class cmd:
         self.phases = phases
         self.roles = roles
         self.nicks = nicks # iterable of nicks that can use the command at any time (should be a mutable object)
-        self.old_api = old_api # functions using the old API will get (cli, nick, chan, rest) passed in
         self.func = None
         self.aftergame = False
         self.name = cmds[0]
@@ -223,13 +222,7 @@ class cmd:
         return self
 
     @handle_error
-    def caller(self, var, wrapper, message):
-        # The wrapper is an object which will know the sender and target
-        # It will have methods such as .reply(), taking off the load from the end code
-        raise NotImplementedError("The new interface has not been implemented yet")
-
-    @handle_error
-    def old_api_caller(self, *args):
+    def caller(self, *args):
         largs = list(args)
 
         cli, rawnick, chan, rest = largs

src/gamemodes.py

@@ -863,10 +863,10 @@ class SleepyMode(GameMode):
         events.add_listener("transition_day_begin", self.nightmare_kill)
         events.add_listener("del_player", self.happy_fun_times)
         events.add_listener("rename_player", self.rename_player)
-        self.north_cmd = decorators.cmd("north", "n", chan=False, pm=True, playing=True, old_api=True, phases=("night",))(self.north)
-        self.east_cmd = decorators.cmd("east", "e", chan=False, pm=True, playing=True, old_api=True, phases=("night",))(self.east)
-        self.south_cmd = decorators.cmd("south", "s", chan=False, pm=True, playing=True, old_api=True, phases=("night",))(self.south)
-        self.west_cmd = decorators.cmd("west", "w", chan=False, pm=True, playing=True, old_api=True, phases=("night",))(self.west)
+        self.north_cmd = decorators.cmd("north", "n", chan=False, pm=True, playing=True, phases=("night",))(self.north)
+        self.east_cmd = decorators.cmd("east", "e", chan=False, pm=True, playing=True, phases=("night",))(self.east)
+        self.south_cmd = decorators.cmd("south", "s", chan=False, pm=True, playing=True, phases=("night",))(self.south)
+        self.west_cmd = decorators.cmd("west", "w", chan=False, pm=True, playing=True, phases=("night",))(self.west)
 
     def teardown(self):
         from src import decorators
@@ -1248,7 +1248,7 @@ class MaelstromMode(GameMode):
         # let them know their role
         # FIXME: this is fugly
         from src.decorators import COMMANDS
-        COMMANDS["myrole"][0].old_api_caller(cli, nick, chan, "") # FIXME: old api and stuff
+        COMMANDS["myrole"][0].caller(cli, nick, chan, "")
         # if they're a wolfchat role, alert the other wolves
         if role in var.WOLFCHAT_ROLES:
             relay_wolfchat_command(cli, nick, messages["wolfchat_new_member"].format(nick, role), var.WOLFCHAT_ROLES, is_wolf_command=True, is_kill_command=True)

src/handler.py

@@ -26,10 +26,7 @@ def on_privmsg(cli, rawnick, chan, msg, *, notice=False):
         chan = users.parse_rawnick_as_dict(rawnick)["nick"]
 
     for fn in decorators.COMMANDS[""]:
-        if fn.old_api:
-            fn.old_api_caller(cli, rawnick, chan, msg)
-        else:
-            fn.caller(var, wrapper, msg) # FIXME: The wrapper doesn't exist yet (the new interface is not supported)
+        fn.caller(cli, rawnick, chan, msg)
 
     phase = var.PHASE
     for x in list(decorators.COMMANDS.keys()):
@@ -44,10 +41,7 @@ def on_privmsg(cli, rawnick, chan, msg, *, notice=False):
         if not h or h[0] == " ":
             for fn in decorators.COMMANDS.get(x, []):
                 if phase == var.PHASE:
-                    if fn.old_api:
-                        fn.old_api_caller(cli, rawnick, chan, h.lstrip())
-                    else:
-                        fn.caller(var, wrapper, h.lstrip()) # FIXME
+                    fn.caller(cli, rawnick, chan, h.lstrip())
 
 def unhandled(cli, prefix, cmd, *args):
     for fn in decorators.HOOKS.get(cmd, []):

src/roles/angel.py

@@ -16,7 +16,7 @@ GUARDED = {} # type: Dict[str, str]
 LASTGUARDED = {} # type: Dict[str, str]
 PASSED = set() # type: Set[str]
 
-@cmd("guard", "protect", "save", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("bodyguard", "guardian angel"), old_api=True)
+@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 killed that night."""
     if nick in GUARDED:
@@ -48,7 +48,7 @@ def guard(cli, nick, chan, rest):
     debuglog("{0} ({1}) GUARD: {2} ({3})".format(nick, role, victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("pass", chan=False, pm=True, playing=True, phases=("night",), roles=("bodyguard", "guardian angel"), old_api=True)
+@cmd("pass", chan=False, pm=True, playing=True, phases=("night",), roles=("bodyguard", "guardian angel"))
 def pass_cmd(cli, nick, chan, rest):
     """Decline to use your special power for that night."""
     if nick in GUARDED:

src/roles/detective.py

@@ -11,7 +11,7 @@ from src.events import Event
 
 INVESTIGATED = set()
 
-@cmd("id", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("detective",), old_api=True)
+@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 nick in INVESTIGATED:

src/roles/doomsayer.py

@@ -15,7 +15,7 @@ LYCANS = {}
 
 _mappings = ("death", KILLS), ("lycan", LYCANS), ("sick", SICK)
 
-@cmd("see", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("doomsayer",), old_api=True)
+@cmd("see", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("doomsayer",))
 def see(cli, nick, chan, rest):
     """Use your paranormal senses to determine a player's doom."""
     role = get_role(nick)

src/roles/dullahan.py

@@ -14,7 +14,7 @@ import botconfig
 KILLS = {} # type: Dict[str, str]
 TARGETS = {} # type: Dict[str, Set[str]]
 
-@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("dullahan",), old_api=True)
+@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("dullahan",))
 def dullahan_kill(cli, nick, chan, rest):
     """Kill someone at night as a dullahan until everyone on your list is dead."""
     if not TARGETS[nick] & set(list_players()):
@@ -45,7 +45,7 @@ def dullahan_kill(cli, nick, chan, rest):
 
     chk_nightdone(cli)
 
-@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",), roles=("dullahan",), old_api=True)
+@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",), roles=("dullahan",))
 def dullahan_retract(cli, nick, chan, rest):
     """Removes a dullahan's kill selection."""
     if nick not in KILLS:

src/roles/hunter.py

@@ -13,7 +13,7 @@ KILLS = {} # type: Dict[str, str]
 HUNTERS = set()
 PASSED = set()
 
-@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hunter",), old_api=True)
+@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hunter",))
 def hunter_kill(cli, nick, chan, rest):
     """Kill someone once per game."""
     if nick in HUNTERS and nick not in KILLS:
@@ -44,7 +44,7 @@ def hunter_kill(cli, nick, chan, rest):
     debuglog("{0} ({1}) KILL: {2} ({3})".format(nick, get_role(nick), victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",), roles=("hunter",), old_api=True)
+@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",), roles=("hunter",))
 def hunter_retract(cli, nick, chan, rest):
     """Removes a hunter's kill selection."""
     if nick not in KILLS and nick not in PASSED:
@@ -55,7 +55,7 @@ def hunter_retract(cli, nick, chan, rest):
     PASSED.discard(nick)
     pm(cli, nick, messages["retracted_kill"])
 
-@cmd("pass", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hunter",), old_api=True)
+@cmd("pass", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hunter",))
 def hunter_pass(cli, nick, chan, rest):
     """Do not use hunter's once-per-game kill tonight."""
     if nick in HUNTERS and nick not in KILLS:

src/roles/seer.py

@@ -10,7 +10,7 @@ from src.events import Event
 
 SEEN = set()
 
-@cmd("see", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("seer", "oracle", "augur"), old_api=True)
+@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 = get_role(nick)

src/roles/shaman.py

@@ -51,9 +51,9 @@ DECEIT = set()       # type: Set[str]
 havetotem = [] # type: List[str]
 brokentotem = set() # type: Set[str]
 
-@cmd("give", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=var.TOTEM_ORDER, old_api=True)
-@cmd("totem", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=var.TOTEM_ORDER, old_api=True)
-def totem(cli, nick, chan, rest, prefix="You"): # XXX: The transition_day_begin event needs updating alongside this
+@cmd("give", chan=False, pm=True, playing=True, silenced=True, phases=("night",), 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, prefix="You"):
     """Give a totem to a player."""
     victim = get_victim(cli, nick, re.split(" +",rest)[0], False, True)
     if not victim:
@@ -320,7 +320,7 @@ def on_transition_day_begin(evt, cli, var):
                         ps.remove(succubus)
             if ps:
                 target = random.choice(ps)
-                totem.func(cli, shaman, shaman, target, messages["random_totem_prefix"]) # XXX: Old API
+                totem.func(cli, shaman, shaman, target, messages["random_totem_prefix"])
             else:
                 LASTGIVEN[shaman] = None
         elif shaman not in SHAMANS:

src/roles/vengefulghost.py

@@ -16,7 +16,7 @@ GHOSTS = {} # type: Dict[str, str]
 # as such, no need to track nick changes, etc. with it
 drivenoff = {} # type: Dict[str, str]
 
-@cmd("kill", chan=False, pm=True, playing=False, silenced=True, phases=("night",), nicks=GHOSTS, old_api=True)
+@cmd("kill", chan=False, pm=True, playing=False, silenced=True, phases=("night",), nicks=GHOSTS)
 def vg_kill(cli, nick, chan, rest):
     """Take revenge on someone each night after you die."""
     if GHOSTS[nick][0] == "!":
@@ -53,7 +53,7 @@ def vg_kill(cli, nick, chan, rest):
     debuglog("{0} ({1}) KILL: {2} ({3})".format(nick, get_role(nick), victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("retract", "r", chan=False, pm=True, playing=False, phases=("night",), old_api=True)
+@cmd("retract", "r", chan=False, pm=True, playing=False, phases=("night",))
 def vg_retract(cli, nick, chan, rest):
     """Removes a vengeful ghost's kill selection."""
     if nick not in GHOSTS:

src/roles/vigilante.py

@@ -12,7 +12,7 @@ from src.events import Event
 KILLS = {} # type: Dict[str, str]
 PASSED = set()
 
-@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("vigilante",), old_api=True)
+@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("vigilante",))
 def vigilante_kill(cli, nick, chan, rest):
     """Kill someone at night, but you die too if they aren't a wolf or win stealer!"""
     victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
@@ -40,7 +40,7 @@ def vigilante_kill(cli, nick, chan, rest):
 
     chk_nightdone(cli)
 
-@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",), roles=("vigilante",), old_api=True)
+@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",), roles=("vigilante",))
 def vigilante_retract(cli, nick, chan, rest):
     """Removes a vigilante's kill selection."""
     if nick not in KILLS and nick not in PASSED:
@@ -50,7 +50,7 @@ def vigilante_retract(cli, nick, chan, rest):
     PASSED.discard(nick)
     pm(cli, nick, messages["retracted_kill"])
 
-@cmd("pass", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("vigilante",), old_api=True)
+@cmd("pass", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("vigilante",))
 def vigilante_pass(cli, nick, chan, rest):
     """Do not kill anyone tonight as a vigilante."""
     if nick in KILLS:

src/roles/wildchild.py

@@ -11,7 +11,7 @@ from src.events import Event
 WILD_CHILDREN = set()
 IDOLS = {}
 
-@cmd("choose", chan=False, pm=True, playing=True, phases=("night",), roles=("wild child",), old_api=True)
+@cmd("choose", chan=False, pm=True, playing=True, phases=("night",), roles=("wild child",))
 def choose_idol(cli, nick, chan, rest):
     """Pick your idol, if they die, you'll become a wolf!"""
     if not var.FIRST_NIGHT:

src/roles/wolf.py

@@ -16,7 +16,7 @@ KILLS = {} # type: Dict[str, List[str]]
 # simply modifying var.WOLF_ROLES will *not* update this!
 CAN_KILL = set(var.WOLF_ROLES - {"wolf cub"}) # type: Set[str]
 
-@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=CAN_KILL, old_api=True)
+@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=CAN_KILL)
 def wolf_kill(cli, nick, chan, rest):
     """Kills one or more players as a wolf."""
     role = get_role(nick)
@@ -83,7 +83,7 @@ def wolf_kill(cli, nick, chan, rest):
 
     chk_nightdone(cli)
 
-@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",), old_api=True)
+@cmd("retract", "r", chan=False, pm=True, playing=True, phases=("night",))
 def wolf_retract(cli, nick, chan, rest):
     """Removes a wolf's kill selection."""
     if nick in KILLS:

src/warnings.py

@@ -212,7 +212,7 @@ def add_warning(cli, target, amount, actor, reason, notes=None, expires=None, sa
 
     return sid
 
-@cmd("stasis", chan=True, pm=True, old_api=True)
+@cmd("stasis", chan=True, pm=True)
 def stasis(cli, nick, chan, rest):
     st = is_user_stasised(nick)
     if st:
@@ -222,7 +222,7 @@ def stasis(cli, nick, chan, rest):
 
     reply(cli, nick, chan, msg, prefix_nick=True)
 
-@cmd("fstasis", flag="A", chan=True, pm=True, old_api=True)
+@cmd("fstasis", flag="A", chan=True, pm=True)
 def fstasis(cli, nick, chan, rest):
     """Removes or views stasis penalties."""
 
@@ -295,7 +295,7 @@ def fstasis(cli, nick, chan, rest):
     else:
         reply(cli, nick, chan, messages["noone_stasised"])
 
-@cmd("warn", pm=True, old_api=True)
+@cmd("warn", pm=True)
 def warn(cli, nick, chan, rest):
     """View and acknowledge your warnings."""
     # !warn list [-all] [page] - lists all active warnings, or all warnings if all passed
@@ -455,7 +455,7 @@ def warn(cli, nick, chan, rest):
         reply(cli, nick, chan, messages["fwarn_done"])
         return
 
-@cmd("fwarn", flag="F", pm=True, old_api=True)
+@cmd("fwarn", flag="F", pm=True)
 def fwarn(cli, nick, chan, rest):
     """Issues a warning to someone or views warnings."""
     # !fwarn list [-all] [nick] [page]

src/wolfgame.py

@@ -135,12 +135,12 @@ def connect_callback():
             signal.signal(signal.SIGINT, signal.SIG_DFL)
 
         if signum in (signal.SIGINT, signal.SIGTERM):
-            forced_exit.func(cli, "<console>", botconfig.CHANNEL, "") # XXX: Old API
+            forced_exit.func(cli, "<console>", botconfig.CHANNEL, "")
         elif signum == SIGUSR1:
-            restart_program.func(cli, "<console>", botconfig.CHANNEL, "") # XXX: Old API
+            restart_program.func(cli, "<console>", botconfig.CHANNEL, "")
         elif signum == SIGUSR2:
             plog("Scheduling aftergame restart")
-            aftergame.func(cli, "<console>", botconfig.CHANNEL, "frestart") # XXX: Old API
+            aftergame.func(cli, "<console>", botconfig.CHANNEL, "frestart")
 
     signal.signal(signal.SIGINT, sighandler)
     signal.signal(signal.SIGTERM, sighandler)
@@ -328,7 +328,7 @@ def reset():
 
 reset()
 
-@cmd("sync", "fsync", flag="m", pm=True, old_api=True)
+@cmd("sync", "fsync", flag="m", pm=True)
 def fsync(cli, nick, chan, rest):
     """Makes the bot apply the currently appropriate channel modes."""
     sync_modes(cli)
@@ -351,7 +351,7 @@ def sync_modes(cli):
 
     mass_mode(cli, voices, other)
 
-@cmd("refreshdb", flag="m", pm=True, old_api=True)
+@cmd("refreshdb", flag="m", pm=True)
 def refreshdb(cli, nick, chan, rest):
     """Updates our tracking vars to the current db state."""
     db.expire_stasis()
@@ -359,8 +359,8 @@ def refreshdb(cli, nick, chan, rest):
     expire_tempbans()
     reply(cli, nick, chan, "Done.")
 
-@cmd("die", "bye", "fdie", "fbye", flag="D", pm=True, old_api=True)
-def forced_exit(cli, nick, chan, rest): # XXX: sighandler (top of file) also needs updating alongside this one
+@cmd("die", "bye", "fdie", "fbye", flag="D", pm=True)
+def forced_exit(cli, nick, chan, rest):
     """Forces the bot to close."""
 
     args = rest.split()
@@ -412,8 +412,8 @@ def _restart_program(cli, mode=None):
         os.execl(python, python, *sys.argv)
 
 
-@cmd("restart", "frestart", flag="D", pm=True, old_api=True)
-def restart_program(cli, nick, chan, rest): # XXX: sighandler (top of file) also needs updating alongside this one
+@cmd("restart", "frestart", flag="D", pm=True)
+def restart_program(cli, nick, chan, rest):
     """Restarts the bot."""
 
     args = rest.split()
@@ -481,7 +481,7 @@ def restart_program(cli, nick, chan, rest): # XXX: sighandler (top of file) also
     var.RESTARTING = True
 
 
-@cmd("ping", pm=True, old_api=True)
+@cmd("ping", pm=True)
 def pinger(cli, nick, chan, rest):
     """Check if you or the bot is still connected."""
     reply(cli, nick, chan, random.choice(messages["ping"]).format(
@@ -490,7 +490,7 @@ def pinger(cli, nick, chan, rest):
         cmd_char=botconfig.CMD_CHAR,
         goat_action=random.choice(messages["goat_actions"])))
 
-@cmd("simple", raw_nick=True, pm=True, old_api=True)
+@cmd("simple", raw_nick=True, pm=True)
 def mark_simple_notify(cli, nick, chan, rest):
     """Makes the bot give you simple role instructions, in case you are familiar with the roles."""
 
@@ -546,7 +546,7 @@ def mark_simple_notify(cli, nick, chan, rest):
 
     reply(cli, nick, chan, messages["simple_on"], private=True)
 
-@cmd("notice", raw_nick=True, pm=True, old_api=True)
+@cmd("notice", raw_nick=True, pm=True)
 def mark_prefer_notice(cli, nick, chan, rest):
     """Makes the bot NOTICE you for every interaction."""
 
@@ -607,7 +607,7 @@ def mark_prefer_notice(cli, nick, chan, rest):
 
     reply(cli, nick, chan, messages["notice_on"], private=True)
 
-@cmd("swap", "replace", pm=True, phases=("join", "day", "night"), old_api=True)
+@cmd("swap", "replace", pm=True, phases=("join", "day", "night"))
 def replace(cli, nick, chan, rest):
     """Swap out a player logged in to your account."""
     if not users.exists(nick) or not users.get(nick).inchan:
@@ -671,9 +671,9 @@ def replace(cli, nick, chan, rest):
             mass_mode(cli, [("-v", target), ("+v", nick)], [])
 
         cli.msg(botconfig.CHANNEL, messages["player_swap"].format(nick, target))
-        myrole.old_api_caller(cli, nick, chan, "")
+        myrole.caller(cli, nick, chan, "")
 
-@cmd("pingif", "pingme", "pingat", "pingpref", pm=True, old_api=True)
+@cmd("pingif", "pingme", "pingat", "pingpref", pm=True)
 def altpinger(cli, nick, chan, rest):
     """Pings you when the number of players reaches your preference. Usage: "pingif <players>". https://werewolf.chat/Pingif"""
     players = is_user_altpinged(nick)
@@ -955,7 +955,7 @@ def leave_deadchat(cli, nick, force=""):
     mass_privmsg(cli, var.DEADCHAT_PLAYERS, msg)
     mass_privmsg(cli, var.SPECTATING_DEADCHAT, "[deadchat] " + msg)
 
-@cmd("deadchat", pm=True, old_api=True)
+@cmd("deadchat", pm=True)
 def deadchat_pref(cli, nick, chan, rest):
     """Toggles auto joining deadchat on death."""
     if not var.ENABLE_DEADCHAT:
@@ -991,7 +991,7 @@ def deadchat_pref(cli, nick, chan, rest):
 
     reply(cli, nick, chan, msg, private=True)
 
-@cmd("join", "j", pm=True, old_api=True)
+@cmd("join", "j", pm=True)
 def join(cli, nick, chan, rest):
     """Either starts a new game of Werewolf or joins an existing game that has not started yet."""
     # keep this and the event in fjoin() in sync
@@ -1179,7 +1179,7 @@ def kill_join(cli, chan):
         var.AFTER_FLASTGAME = None
 
 
-@cmd("fjoin", flag="A", old_api=True)
+@cmd("fjoin", flag="A")
 def fjoin(cli, nick, chan, rest):
     """Forces someone to join a game."""
     # keep this and the event in def join() in sync
@@ -1232,7 +1232,7 @@ def fjoin(cli, nick, chan, rest):
     if fake:
         cli.msg(chan, messages["fjoin_success"].format(nick, len(list_players())))
 
-@cmd("fleave", "fquit", flag="A", pm=True, phases=("join", "day", "night"), old_api=True)
+@cmd("fleave", "fquit", flag="A", pm=True, phases=("join", "day", "night"))
 def fleave(cli, nick, chan, rest):
     """Forces someone to leave the game."""
 
@@ -1281,7 +1281,7 @@ def fleave(cli, nick, chan, rest):
             cli.msg(chan, messages["not_playing"].format(a))
             return
 
-@cmd("fstart", flag="A", phases=("join",), old_api=True)
+@cmd("fstart", flag="A", phases=("join",))
 def fstart(cli, nick, chan, rest):
     """Forces the game to start immediately."""
     cli.msg(botconfig.CHANNEL, messages["fstart_success"].format(nick))
@@ -1333,7 +1333,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, phases=("join", "day", "night"), old_api=True)
+@cmd("stats", "players", pm=True, phases=("join", "day", "night"))
 def stats(cli, nick, chan, rest):
     """Displays the player statistics."""
 
@@ -1975,7 +1975,7 @@ def hurry_up(cli, gameid, change):
         cli.msg(chan, messages["sunset"])
         event.data["transition_night"](cli)
 
-@cmd("fnight", flag="d", old_api=True)
+@cmd("fnight", flag="d")
 def fnight(cli, nick, chan, rest):
     """Forces the day to end and night to begin."""
     if var.PHASE != "day":
@@ -1984,7 +1984,7 @@ def fnight(cli, nick, chan, rest):
         hurry_up(cli, 0, True)
 
 
-@cmd("fday", flag="d", old_api=True)
+@cmd("fday", flag="d")
 def fday(cli, nick, chan, rest):
     """Forces the night to end and the next day to begin."""
     if var.PHASE != "night":
@@ -2117,7 +2117,7 @@ def chk_decision(cli, force=""):
         if do_night_transision:
             event.data["transition_night"](cli)
 
-@cmd("votes", pm=True, phases=("join", "day", "night"), old_api=True)
+@cmd("votes", pm=True, phases=("join", "day", "night"))
 def show_votes(cli, nick, chan, rest):
     """Displays the voting statistics."""
 
@@ -3203,7 +3203,7 @@ def reaper(cli, gameid):
 
 
 
-@cmd("", old_api=True)  # update last said
+@cmd("")  # update last said
 def update_last_said(cli, nick, chan, rest):
     if chan != botconfig.CHANNEL:
         return
@@ -3259,7 +3259,7 @@ def on_join(cli, raw_nick, chan, acc="*", rname=""):
 #    if "@" + botconfig.NICK in names:
 #        var.OPPED = True
 
-@cmd("goat", playing=True, phases=("day",), old_api=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."""
 
@@ -3287,7 +3287,7 @@ def goat(cli, nick, chan, rest):
 
     var.GOATED = True
 
-@cmd("fgoat", flag="j", old_api=True)
+@cmd("fgoat", flag="j")
 def fgoat(cli, nick, chan, rest):
     """Forces a goat to interact with anyone or anything, without limitations."""
     nick_ = rest.split(' ')[0].strip()
@@ -3592,7 +3592,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", pm=True, phases=("join", "day", "night"), old_api=True)
+@cmd("quit", "leave", pm=True, phases=("join", "day", "night"))
 def leave_game(cli, nick, chan, rest):
     """Quits the game."""
     if chan == botconfig.CHANNEL:
@@ -3757,7 +3757,7 @@ def transition_day(cli, gameid=0):
             for mm in var.ROLES["matchmaker"]:
                 if mm not in var.MATCHMAKERS:
                     lovers = random.sample(pl, 2)
-                    choose.func(cli, mm, mm, lovers[0] + " " + lovers[1], sendmsg=False) # XXX: Old API
+                    choose.func(cli, mm, mm, lovers[0] + " " + lovers[1], sendmsg=False)
                     pm(cli, mm, messages["random_matchmaker"])
 
     # Reset daytime variables
@@ -4278,7 +4278,7 @@ def chk_nightdone(cli):
         if var.PHASE == "night":  # Double check
             event.data["transition_day"](cli)
 
-@cmd("nolynch", "nl", "novote", "nv", "abstain", "abs", playing=True, phases=("day",), old_api=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:
@@ -4312,11 +4312,11 @@ def no_lynch(cli, nick, chan, rest):
         chk_decision(cli)
         return
 
-@cmd("lynch", playing=True, pm=True, phases=("day",), old_api=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:
-        show_votes.old_api_caller(cli, nick, chan, rest)
+        show_votes.caller(cli, nick, chan, rest)
         return
     if chan != botconfig.CHANNEL:
         return
@@ -4610,7 +4610,7 @@ def check_exchange(cli, actor, nick):
         return True
     return False
 
-@cmd("retract", "r", pm=True, phases=("day", "join"), old_api=True)
+@cmd("retract", "r", pm=True, phases=("day", "join"))
 def retract(cli, nick, chan, rest):
     """Takes back your vote during the day (for whom to lynch)."""
 
@@ -4653,7 +4653,7 @@ def retract(cli, nick, chan, rest):
     else:
         cli.notice(nick, messages["pending_vote"])
 
-@cmd("shoot", playing=True, silenced=True, phases=("day",), old_api=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."""
 
@@ -4741,7 +4741,7 @@ def shoot(cli, nick, chan, rest):
 def is_safe(nick, victim): # helper function
     return nick in var.ENTRANCED and victim in var.ROLES["succubus"]
 
-@cmd("bless", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("priest",), old_api=True)
+@cmd("bless", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("priest",))
 def bless(cli, nick, chan, rest):
     """Bless a player, preventing them from being killed for the remainder of the game."""
     if nick in var.PRIESTS:
@@ -4766,7 +4766,7 @@ def bless(cli, nick, chan, rest):
     pm(cli, victim, messages["blessed_notify_target"])
     debuglog("{0} ({1}) BLESS: {2} ({3})".format(nick, get_role(nick), victim, get_role(victim)))
 
-@cmd("consecrate", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("priest",), old_api=True)
+@cmd("consecrate", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("priest",))
 def consecrate(cli, nick, chan, rest):
     """Consecrates a corpse, putting its spirit to rest and preventing other unpleasant things from happening."""
     alive = list_players()
@@ -4797,7 +4797,7 @@ def consecrate(cli, nick, chan, rest):
     # consecrating can possibly cause game to end, so check for that
     chk_win(cli)
 
-@cmd("observe", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("werecrow", "sorcerer"), old_api=True)
+@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 = get_role(nick)
@@ -4848,7 +4848,7 @@ def observe(cli, nick, chan, rest):
     debuglog("{0} ({1}) OBSERVE: {2} ({3})".format(nick, role, victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("pray", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("prophet",), old_api=True)
+@cmd("pray", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("prophet",))
 def pray(cli, nick, chan, rest):
     """Receive divine visions of who has a role."""
     # this command may be used multiple times in the course of the night, however it only needs
@@ -4951,7 +4951,7 @@ def pray(cli, nick, chan, rest):
 
     chk_nightdone(cli)
 
-@cmd("visit", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("harlot", "succubus"), old_api=True)
+@cmd("visit", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("harlot", "succubus"))
 def hvisit(cli, nick, chan, rest):
     """Visit a player. You will die if you visit a wolf or a target of the wolves."""
     role = get_role(nick)
@@ -4967,7 +4967,7 @@ def hvisit(cli, nick, chan, rest):
         return
 
     if nick == victim:  # Staying home (same as calling pass, so call pass)
-        pass_cmd.func(cli, nick, chan, "") # XXX: Old API
+        pass_cmd.func(cli, nick, chan, "")
         return
     else:
         victim = choose_target(nick, victim)
@@ -5033,8 +5033,8 @@ def hvisit(cli, nick, chan, rest):
     debuglog("{0} ({1}) VISIT: {2} ({3})".format(nick, role, victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("give", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("doctor",), old_api=True)
-@cmd("immunize", "immunise", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("doctor",), old_api=True)
+@cmd("give", chan=False, pm=True, playing=True, silenced=True, phases=("day",), 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 nick not in var.DOCTORS: # something with amnesiac or clone or exchange totem
@@ -5070,7 +5070,7 @@ def immunize(cli, nick, chan, rest):
         var.DOCTORS[nick] -= 1
     debuglog("{0} ({1}) IMMUNIZE: {2} ({3})".format(nick, get_role(nick), victim, "lycan" if lycan else get_role(victim)))
 
-@cmd("bite", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("alpha wolf",), old_api=True)
+@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."""
     if nick in var.ALPHA_WOLVES and nick not in var.BITE_PREFERENCES:
@@ -5107,8 +5107,8 @@ def bite_cmd(cli, nick, chan, rest):
     chk_nightdone(cli)
 
 @cmd("pass", chan=False, pm=True, playing=True, phases=("night",),
-    roles=("harlot", "turncoat", "warlock", "succubus"), old_api=True)
-def pass_cmd(cli, nick, chan, rest): # XXX: hvisit (3 functions above this one) also needs updating alongside this
+    roles=("harlot", "turncoat", "warlock", "succubus"))
+def pass_cmd(cli, nick, chan, rest):
     """Decline to use your special power for that night."""
     nickrole = get_role(nick)
 
@@ -5155,7 +5155,7 @@ def pass_cmd(cli, nick, chan, rest): # XXX: hvisit (3 functions above this one)
     debuglog("{0} ({1}) PASS".format(nick, get_role(nick)))
     chk_nightdone(cli)
 
-@cmd("side", chan=False, pm=True, playing=True, phases=("night",), roles=("turncoat",), old_api=True)
+@cmd("side", chan=False, pm=True, playing=True, phases=("night",), roles=("turncoat",))
 def change_sides(cli, nick, chan, rest, sendmsg=True):
     if var.TURNCOATS[nick][1] == var.NIGHT_COUNT - 1:
         pm(cli, nick, messages["turncoat_already_turned"])
@@ -5172,9 +5172,9 @@ def change_sides(cli, nick, chan, rest, sendmsg=True):
     debuglog("{0} ({1}) SIDE {2}".format(nick, get_role(nick), team))
     chk_nightdone(cli)
 
-@cmd("choose", chan=False, pm=True, playing=True, phases=("night",), roles=("matchmaker",), old_api=True)
-@cmd("match", chan=False, pm=True, playing=True, phases=("night",), roles=("matchmaker",), old_api=True)
-def choose(cli, nick, chan, rest, sendmsg=True): # XXX: transition_day also needs updating alongside this one
+@cmd("choose", chan=False, pm=True, playing=True, phases=("night",), roles=("matchmaker",))
+@cmd("match", chan=False, pm=True, playing=True, phases=("night",), roles=("matchmaker",))
+def choose(cli, nick, chan, rest, sendmsg=True):
     """Select two players to fall in love. You may select yourself as one of the lovers."""
     if not var.FIRST_NIGHT:
         return
@@ -5236,7 +5236,7 @@ def choose(cli, nick, chan, rest, sendmsg=True): # XXX: transition_day also need
     debuglog("{0} ({1}) MATCH: {2} ({3}) + {4} ({5})".format(nick, get_role(nick), victim, get_role(victim), victim2, get_role(victim2)))
     chk_nightdone(cli)
 
-@cmd("target", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("assassin",), old_api=True)
+@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.TARGETED.get(nick) is not None:
@@ -5262,7 +5262,7 @@ def target(cli, nick, chan, rest):
     debuglog("{0} ({1}-{2}) TARGET: {3} ({4})".format(nick, "-".join(get_templates(nick)), get_role(nick), victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("hex", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hag",), old_api=True)
+@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 nick in var.HEXED:
@@ -5305,7 +5305,7 @@ def hex_target(cli, nick, chan, rest):
     debuglog("{0} ({1}) HEX: {2} ({3})".format(nick, get_role(nick), victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("curse", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("warlock",), old_api=True)
+@cmd("curse", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("warlock",))
 def curse(cli, nick, chan, rest):
     if nick in var.CURSED:
         # CONSIDER: this happens even if they choose to not curse, should maybe let them
@@ -5350,7 +5350,7 @@ def curse(cli, nick, chan, rest):
     debuglog("{0} ({1}) CURSE: {2} ({3})".format(nick, get_role(nick), victim, vrole))
     chk_nightdone(cli)
 
-@cmd("clone", chan=False, pm=True, playing=True, phases=("night",), roles=("clone",), old_api=True)
+@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 not var.FIRST_NIGHT:
@@ -5376,7 +5376,7 @@ def clone(cli, nick, chan, rest):
     debuglog("{0} ({1}) CLONE: {2} ({3})".format(nick, get_role(nick), victim, get_role(victim)))
     chk_nightdone(cli)
 
-@cmd("charm", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("piper",), old_api=True)
+@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 nick in var.CHARMERS:
@@ -5540,7 +5540,7 @@ def getfeatures(cli, nick, *rest):
                 errlog("Unsupported case mapping: {0!r}; falling back to rfc1459.".format(var.CASEMAPPING))
                 var.CASEMAPPING = "rfc1459"
 
-@cmd("", chan=False, pm=True, old_api=True)
+@cmd("", chan=False, pm=True)
 def relay(cli, nick, chan, rest):
     """Wolfchat and Deadchat"""
     if rest.startswith("\u0001PING"):
@@ -5982,7 +5982,7 @@ def expire_start_votes(cli, chan):
         var.START_VOTES = set()
         cli.msg(chan, messages["start_expired"])
 
-@cmd("start", phases=("none", "join"), old_api=True)
+@cmd("start", phases=("none", "join"))
 def start_cmd(cli, nick, chan, rest):
     """Starts a game of Werewolf."""
     start(cli, nick, chan)
@@ -6388,7 +6388,7 @@ def on_error(cli, pfx, msg):
     elif msg.startswith("Closing Link:"):
         raise SystemExit
 
-@cmd("template", "ftemplate", flag="F", pm=True, old_api=True)
+@cmd("template", "ftemplate", flag="F", pm=True)
 def ftemplate(cli, nick, chan, rest):
     params = re.split(" +", rest)
 
@@ -6453,7 +6453,7 @@ def ftemplate(cli, nick, chan, rest):
         # re-init var.FLAGS and var.FLAGS_ACCS since they may have changed
         db.init_vars()
 
-@cmd("fflags", flag="F", pm=True, old_api=True)
+@cmd("fflags", flag="F", pm=True)
 def fflags(cli, nick, chan, rest):
     params = re.split(" +", rest)
 
@@ -6551,7 +6551,7 @@ def fflags(cli, nick, chan, rest):
         db.init_vars()
 
 
-@cmd("wait", "w", playing=True, phases=("join",), old_api=True)
+@cmd("wait", "w", playing=True, phases=("join",))
 def wait(cli, nick, chan, rest):
     """Increases the wait time until !start can be used."""
     pl = list_players()
@@ -6582,7 +6582,7 @@ def wait(cli, nick, chan, rest):
         cli.msg(chan, messages["wait_time_increase"].format(nick, var.EXTRA_WAIT))
 
 
-@cmd("fwait", flag="A", phases=("join",), old_api=True)
+@cmd("fwait", flag="A", 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."""
 
@@ -6609,7 +6609,7 @@ def fwait(cli, nick, chan, rest):
         cli.msg(chan, messages["forced_wait_time_decrease"].format(nick, abs(extra), "s" if extra != -1 else ""))
 
 
-@cmd("fstop", flag="A", phases=("join", "day", "night"), old_api=True)
+@cmd("fstop", flag="A", phases=("join", "day", "night"))
 def reset_game(cli, nick, chan, rest):
     """Forces the game to stop."""
     if nick == "<stderr>":
@@ -6624,7 +6624,7 @@ def reset_game(cli, nick, chan, rest):
         reset()
         cli.msg(botconfig.CHANNEL, "PING! {0}".format(" ".join(pl)))
 
-@cmd("rules", pm=True, old_api=True)
+@cmd("rules", pm=True)
 def show_rules(cli, nick, chan, rest):
     """Displays the rules."""
 
@@ -6641,7 +6641,7 @@ def show_rules(cli, nick, chan, rest):
     else:
         reply(cli, nick, chan, messages["no_channel_rules"].format(botconfig.CHANNEL))
 
-@cmd("help", raw_nick=True, pm=True, old_api=True)
+@cmd("help", raw_nick=True, pm=True)
 def get_help(cli, rnick, chan, rest):
     """Gets help."""
     nick, _, ident, host = parse_nick(rnick)
@@ -6702,7 +6702,7 @@ def get_wiki_page(URI):
         return False, messages["wiki_open_failure"]
     return True, parsed
 
-@cmd("wiki", pm=True, old_api=True)
+@cmd("wiki", pm=True)
 def wiki(cli, nick, chan, rest):
     """Prints information on roles from the wiki."""
 
@@ -6761,7 +6761,7 @@ def on_invite(cli, raw_nick, something, chan):
         cli.join(chan) # Allows the bot to be present in any channel
         debuglog(nick, "INVITE", chan, display=True)
 
-@cmd("part", "fpart", raw_nick=True, flag="A", pm=True, old_api=True)
+@cmd("part", "fpart", raw_nick=True, flag="A", pm=True)
 def fpart(cli, rnick, chan, rest):
     """Makes the bot forcibly leave a channel."""
     nick = parse_nick(rnick)[0]
@@ -6780,7 +6780,7 @@ def fpart(cli, rnick, chan, rest):
         return
     cli.part(chan)
 
-@cmd("admins", "ops", pm=True, old_api=True)
+@cmd("admins", "ops", pm=True)
 def show_admins(cli, nick, chan, rest):
     """Pings the admins that are available."""
 
@@ -6828,7 +6828,7 @@ def show_admins(cli, nick, chan, rest):
 
     channels.Main.who()
 
-@cmd("coin", pm=True, old_api=True)
+@cmd("coin", pm=True)
 def coin(cli, nick, chan, rest):
     """It's a bad idea to base any decisions on this command."""
 
@@ -6844,7 +6844,7 @@ def coin(cli, nick, chan, rest):
     cmsg = messages["coin_land"].format(coin)
     reply(cli, nick, chan, cmsg)
 
-@cmd("pony", pm=True, old_api=True)
+@cmd("pony", pm=True)
 def pony(cli, nick, chan, rest):
     """Toss a magical pony into the air and see what happens!"""
 
@@ -6863,13 +6863,13 @@ def pony(cli, nick, chan, rest):
     cmsg = messages["pony_land"].format(pony)
     reply(cli, nick, chan, cmsg)
 
-@cmd("cat", pm=True, old_api=True)
+@cmd("cat", pm=True)
 def cat(cli, nick, chan, rest):
     """Toss a cat into the air and see what happens!"""
     reply(cli, nick, chan, messages["cat_toss"].format(nick))
     reply(cli, nick, chan, messages["cat_land"])
 
-@cmd("time", pm=True, phases=("join", "day", "night"), old_api=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."""
 
@@ -6909,7 +6909,7 @@ def timeleft(cli, nick, chan, rest):
 def timeleft_internal(phase):
     return int((var.TIMERS[phase][1] + var.TIMERS[phase][2]) - time.time()) if phase in var.TIMERS else -1
 
-@cmd("roles", pm=True, old_api=True)
+@cmd("roles", pm=True)
 def listroles(cli, nick, chan, rest):
     """Displays which roles are enabled at a certain number of players."""
 
@@ -6999,7 +6999,7 @@ def listroles(cli, nick, chan, rest):
 
     reply(cli, nick, chan, " ".join(msg))
 
-@cmd("myrole", pm=True, phases=("day", "night"), old_api=True)
+@cmd("myrole", pm=True, phases=("day", "night"))
 def myrole(cli, nick, chan, rest):
     """Reminds you of your current role."""
 
@@ -7068,8 +7068,8 @@ def myrole(cli, nick, chan, rest):
         message += "."
         pm(cli, nick, message)
 
-@cmd("aftergame", "faftergame", flag="D", raw_nick=True, pm=True, old_api=True)
-def aftergame(cli, rawnick, chan, rest): # XXX: lastgame (just below this one) and sighandler (top of file) also need updating alongside this one
+@cmd("aftergame", "faftergame", flag="D", raw_nick=True, pm=True)
+def aftergame(cli, rawnick, chan, rest):
     """Schedule a command to be run after the current game."""
     nick = parse_nick(rawnick)[0]
     if not rest.strip():
@@ -7083,7 +7083,7 @@ def aftergame(cli, rawnick, chan, rest): # XXX: lastgame (just below this one) a
         def do_action():
             for fn in COMMANDS[cmd]:
                 fn.aftergame = True
-                fn.old_api_caller(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, messages["command_not_found"])
@@ -7102,7 +7102,7 @@ def aftergame(cli, rawnick, chan, rest): # XXX: lastgame (just below this one) a
     var.AFTER_FLASTGAME = do_action
 
 
-@cmd("lastgame", "flastgame", flag="D", raw_nick=True, pm=True, old_api=True)
+@cmd("lastgame", "flastgame", flag="D", raw_nick=True, pm=True)
 def flastgame(cli, rawnick, chan, rest):
     """Disables starting or joining a game, and optionally schedules a command to run after the current game ends."""
     nick, _, ident, host = parse_nick(rawnick)
@@ -7116,9 +7116,9 @@ def flastgame(cli, rawnick, chan, rest):
     var.ADMIN_TO_PING = nick
 
     if rest.strip():
-        aftergame.func(cli, rawnick, botconfig.CHANNEL, rest) # XXX: Old API
+        aftergame.func(cli, rawnick, botconfig.CHANNEL, rest)
 
-@cmd("gamestats", "gstats", pm=True, old_api=True)
+@cmd("gamestats", "gstats", pm=True)
 def game_stats(cli, nick, chan, rest):
     """Gets the game stats for a given game size or lists game totals for all game sizes if no game size is given."""
     if (chan != nick and var.LAST_GSTATS and var.GSTATS_RATE_LIMIT and
@@ -7159,7 +7159,7 @@ def game_stats(cli, nick, chan, rest):
         # Attempt to find game stats for the given game size
         reply(cli, nick, chan, db.get_game_stats(gamemode, gamesize))
 
-@cmd("playerstats", "pstats", "player", "p", pm=True, old_api=True) # XXX: mystats (just after this) needs updating along this one
+@cmd("playerstats", "pstats", "player", "p", pm=True)
 def player_stats(cli, nick, chan, rest):
     """Gets the stats for the given player and role or a list of role totals if no role is given."""
     if (chan != nick and var.LAST_PSTATS and var.PSTATS_RATE_LIMIT and
@@ -7218,11 +7218,11 @@ def player_stats(cli, nick, chan, rest):
         # Attempt to find the player's stats
         reply(cli, nick, chan, db.get_player_stats(acc, hostmask, role))
 
-@cmd("mystats", "m", pm=True, old_api=True)
+@cmd("mystats", "m", pm=True)
 def my_stats(cli, nick, chan, rest):
     """Get your own stats."""
     rest = rest.split()
-    player_stats.func(cli, nick, chan, " ".join([nick] + rest)) # FIXME: New/old API
+    player_stats.func(cli, nick, chan, " ".join([nick] + rest))
 
 # Called from !game and !join, used to vote for a game mode
 def vote_gamemode(cli, nick, chan, gamemode, doreply):
@@ -7249,7 +7249,7 @@ def vote_gamemode(cli, nick, chan, gamemode, doreply):
         if doreply:
             cli.notice(nick, messages["vote_game_fail"])
 
-@cmd("game", playing=True, phases=("join",), old_api=True)
+@cmd("game", playing=True, phases=("join",))
 def game(cli, nick, chan, rest):
     """Vote for a game mode to be picked."""
     if rest:
@@ -7261,7 +7261,7 @@ def game(cli, nick, chan, rest):
         cli.notice(nick, messages["no_mode_specified"] + gamemodes)
         return
 
-@cmd("games", "modes", pm=True, old_api=True)
+@cmd("games", "modes", pm=True)
 def show_modes(cli, nick, chan, rest):
     """Show the available game modes."""
     msg = messages["available_modes"]
@@ -7276,16 +7276,16 @@ def game_help(args=""):
 game.__doc__ = game_help
 
 
-@cmd("vote", "v", pm=True, phases=("join", "day"), old_api=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:
         if var.PHASE == "join" and chan != nick:
-            return game.old_api_caller(cli, nick, chan, rest)
+            return game.caller(cli, nick, chan, rest)
         else:
-            return lynch.old_api_caller(cli, nick, chan, rest)
+            return lynch.caller(cli, nick, chan, rest)
     else:
-        return show_votes.old_api_caller(cli, nick, chan, rest)
+        return show_votes.caller(cli, nick, chan, rest)
 
 def _call_command(cli, nick, chan, command, no_out=False):
     """
@@ -7316,7 +7316,7 @@ def _call_command(cli, nick, chan, command, no_out=False):
 
     return (ret, out)
 
-@cmd("pull", "fpull", flag="D", pm=True, old_api=True)
+@cmd("pull", "fpull", flag="D", pm=True)
 def fpull(cli, nick, chan, rest):
     """Pulls from the repository to update the bot."""
 
@@ -7336,7 +7336,7 @@ def fpull(cli, nick, chan, rest):
     (ret, _) = _call_command(cli, nick, chan, "git rebase --stat --preserve-merges")
     return (ret == 0)
 
-@cmd("update", flag="D", pm=True, old_api=True)
+@cmd("update", flag="D", pm=True)
 def update(cli, nick, chan, rest):
     """Pulls from the repository and restarts the bot to update it."""
 
@@ -7354,12 +7354,12 @@ def update(cli, nick, chan, rest):
         # Display "Scheduled restart" instead of "Forced restart" when called with !faftergame
         restart_program.aftergame = True
 
-    ret = fpull.old_api_caller(cli, nick, chan, "")
+    ret = fpull.caller(cli, nick, chan, "")
 
     if ret:
-        restart_program.old_api_caller(cli, nick, chan, "Updating bot")
+        restart_program.caller(cli, nick, chan, "Updating bot")
 
-@cmd("send", "fsend", flag="F", pm=True, old_api=True)
+@cmd("send", "fsend", flag="F", pm=True)
 def fsend(cli, nick, chan, rest):
     """Forcibly send raw IRC commands to the server."""
     cli.send(rest)
@@ -7394,12 +7394,12 @@ def _say(cli, raw_nick, rest, command, action=False):
     cli.send("PRIVMSG {0} :{1}".format(target, message))
 
 
-@cmd("say", "fsay", flag="s", raw_nick=True, pm=True, old_api=True)
+@cmd("say", "fsay", flag="s", raw_nick=True, pm=True)
 def fsay(cli, raw_nick, chan, rest):
     """Talk through the bot as a normal message."""
     _say(cli, raw_nick, rest, "say")
 
-@cmd("act", "do", "me", "fact", "fdo", "fme", flag="s", raw_nick=True, pm=True, old_api=True)
+@cmd("act", "do", "me", "fact", "fdo", "fme", flag="s", raw_nick=True, pm=True)
 def fact(cli, raw_nick, chan, rest):
     """Act through the bot as an action."""
     _say(cli, raw_nick, rest, "act", action=True)
@@ -7426,7 +7426,7 @@ def can_run_restricted_cmd(nick):
 
     return True
 
-@cmd("spectate", "fspectate", flag="A", pm=True, phases=("day", "night"), old_api=True)
+@cmd("spectate", "fspectate", flag="A", pm=True, phases=("day", "night"))
 def fspectate(cli, nick, chan, rest):
     """Spectate wolfchat or deadchat."""
     if not can_run_restricted_cmd(nick):
@@ -7472,7 +7472,7 @@ before_debug_mode_commands = list(COMMANDS.keys())
 
 if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
 
-    @cmd("eval", owner_only=True, pm=True, old_api=True)
+    @cmd("eval", owner_only=True, pm=True)
     def pyeval(cli, nick, chan, rest):
         """Evaluate a Python expression."""
         try:
@@ -7484,7 +7484,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
         except Exception as e:
             cli.msg(chan, "{e.__class__.__name__}: {e}".format(e=e))
 
-    @cmd("exec", owner_only=True, pm=True, old_api=True)
+    @cmd("exec", owner_only=True, pm=True)
     def py(cli, nick, chan, rest):
         """Execute arbitrary Python code."""
         try:
@@ -7492,7 +7492,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
         except Exception as e:
             cli.msg(chan, "{e.__class__.__name__}: {e}".format(e=e))
 
-    @cmd("revealroles", flag="a", pm=True, phases=("day", "night"), old_api=True)
+    @cmd("revealroles", flag="a", pm=True, phases=("day", "night"))
     def revealroles(cli, nick, chan, rest):
         """Reveal role information."""
 
@@ -7576,7 +7576,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
             reply(cli, nick, chan, break_long_message(output, " | "), private=True)
 
 
-    @cmd("fgame", flag="d", raw_nick=True, phases=("join",), old_api=True)
+    @cmd("fgame", flag="d", 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]
@@ -7624,7 +7624,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
 
 
     # DO NOT MAKE THIS A PMCOMMAND ALSO
-    @cmd("force", flag="d", old_api=True)
+    @cmd("force", flag="d")
     def force(cli, nick, chan, rest):
         """Force a certain player to use a specific command."""
         rst = re.split(" +",rest)
@@ -7659,15 +7659,15 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
                     continue
                 for user in who:
                     if fn.chan:
-                        fn.old_api_caller(cli, user, chan, " ".join(rst))
+                        fn.caller(cli, user, chan, " ".join(rst))
                     else:
-                        fn.old_api_caller(cli, user, user, " ".join(rst))
+                        fn.caller(cli, user, user, " ".join(rst))
             cli.msg(chan, messages["operation_successful"])
         else:
             cli.msg(chan, messages["command_not_found"])
 
 
-    @cmd("rforce", flag="d", old_api=True)
+    @cmd("rforce", flag="d")
     def rforce(cli, nick, chan, rest):
         """Force all players of a given role to perform a certain action."""
         rst = re.split(" +",rest)
@@ -7699,16 +7699,16 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
                     continue
                 for user in tgt:
                     if fn.chan:
-                        fn.old_api_caller(cli, user, chan, " ".join(rst))
+                        fn.caller(cli, user, chan, " ".join(rst))
                     else:
-                        fn.old_api_caller(cli, user, user, " ".join(rst))
+                        fn.caller(cli, user, user, " ".join(rst))
             cli.msg(chan, messages["operation_successful"])
         else:
             cli.msg(chan, messages["command_not_found"])
 
 
 
-    @cmd("frole", flag="d", phases=("day", "night"), old_api=True)
+    @cmd("frole", flag="d", phases=("day", "night"))
     def frole(cli, nick, chan, rest):
         """Change the role or template of a player."""
         rst = re.split(" +",rest)