From 5789be967ef9de49c825cab3199502b54b4715d8 Mon Sep 17 00:00:00 2001 From: Janik Kleinhoff Date: Fri, 12 Dec 2014 18:53:50 +0000 Subject: [PATCH] ping: more useful behaviour when noone can be pinged --- modules/wolfgame.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 5f872a1..7ede465 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -332,7 +332,6 @@ def pinger(cli, nick, chan, rest): "Please wait a while before using it again.")) return - var.LAST_PING = datetime.now() if var.PINGING: return var.PINGING = True @@ -358,13 +357,17 @@ def pinger(cli, nick, chan, rest): TO_PING.sort(key=lambda x: x.lower()) - cli.msg(chan, "PING! "+" ".join(TO_PING)) + if TO_PING: + var.LAST_PING = datetime.now() + cli.msg(chan, "PING! "+" ".join(TO_PING)) + + minimum = datetime.now() + timedelta(seconds=var.PING_MIN_WAIT) + if not var.CAN_START_TIME or var.CAN_START_TIME < minimum: + var.CAN_START_TIME = minimum + else: + cli.msg(chan, "There is noone currently available to be pinged.") + var.PINGING = False - - minimum = datetime.now() + timedelta(seconds=var.PING_MIN_WAIT) - if not var.CAN_START_TIME or var.CAN_START_TIME < minimum: - var.CAN_START_TIME = minimum - decorators.unhook(HOOKS, 800) cli.who(chan)