From 9ea4f27e36ebd33798ae0590c64c2d0b1cae78b9 Mon Sep 17 00:00:00 2001 From: Edward Powell Date: Mon, 24 Jun 2013 14:08:08 -0400 Subject: [PATCH] [reload, tell] Account for renamed nickname_commands decorator Issue #276 --- willie/modules/reload.py | 4 ++-- willie/modules/tell.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/willie/modules/reload.py b/willie/modules/reload.py index 99a22035b7..a374136f8e 100644 --- a/willie/modules/reload.py +++ b/willie/modules/reload.py @@ -14,7 +14,7 @@ import subprocess -@willie.module.nickname_command("reload") +@willie.module.nickname_commands("reload") @willie.module.priority("low") @willie.module.thread(False) def f_reload(bot, trigger): @@ -88,7 +88,7 @@ def update(bot, trigger): update.rule = ('$nick', ['update'], r'(.+)') -@willie.module.nickname_command("load") +@willie.module.nickname_commands("load") @willie.module.priority("low") @willie.module.thread(False) def f_load(bot, trigger): diff --git a/willie/modules/tell.py b/willie/modules/tell.py index 12d1caff52..f1322e053a 100644 --- a/willie/modules/tell.py +++ b/willie/modules/tell.py @@ -14,7 +14,7 @@ import random import threading from willie.tools import Nick -from willie.module import command, nickname_command, rule, priority, example +from willie.module import commands, nickname_commands, rule, priority, example maximum = 4 @@ -84,9 +84,8 @@ def get_user_time(bot, nick): return (pytz.timezone(tz.strip()), tformat or '%Y-%m-%d %H:%M:%S %Z') -@command('tell') -@nickname_command('tell') -@nickname_command('ask') +@commands('tell', 'ask') +@nickname_commands('tell', 'ask') @example('Willie, tell Embolalia he broke something again.') def f_remind(bot, trigger): """Give someone a message the next time they're seen"""