diff --git a/ping.py b/ping.py index 2e282ff..9ae844c 100755 --- a/ping.py +++ b/ping.py @@ -12,12 +12,16 @@ def hello(phenny, input): if x[0].__name__ == "aa_hook": if x[0](phenny, input): return # Abort function - greeting = random.choice(('Hi', 'Hey', 'Hello')) - punctuation = random.choice(('', '!')) + greeting = random.choice(('Hi', 'Hey', 'Hello', 'sup')) + punctuation = random.choice(('', '!', '.')) phenny.say(greeting + ' ' + input.nick + punctuation) hello.rule = r'(?i)(hi|hello|hey) $nickname[ \t]*$' def interjection(phenny, input): + for x in phenny.bot.commands["high"].values(): + if x[0].__name__ == "aa_hook": + if x[0](phenny, input): + return # Abort function phenny.say(input.nick + '!') interjection.rule = r'$nickname!' interjection.priority = 'high'