From f5d510374a875dd934db1f4d356fffffdc670157 Mon Sep 17 00:00:00 2001 From: skizzerz Date: Tue, 13 Sep 2016 10:55:52 -0500 Subject: [PATCH] Fix !warn ack duplicating stasis, remove !fquit warning --- src/warnings.py | 3 ++- src/wolfgame.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/warnings.py b/src/warnings.py index 4227f88..fd07de8 100644 --- a/src/warnings.py +++ b/src/warnings.py @@ -445,7 +445,8 @@ def warn(cli, nick, chan, rest): reply(cli, nick, chan, messages["fwarn_invalid_warning"]) return - if warning["sanctions"].get("stasis", 0) > 0: + # only add stasis if this is the first time this warning is being acknowledged + if not warning["ack"] and warning["sanctions"].get("stasis", 0) > 0: db.set_stasis(warning["sanctions"]["stasis"], acc, hm, relative=True) db.init_vars() db.acknowledge_warning(warn_id) diff --git a/src/wolfgame.py b/src/wolfgame.py index 7b0934a..16e56f7 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -1318,7 +1318,6 @@ def fleave(cli, nick, chan, rest): if a in rset: var.ORIGINAL_ROLES[r].remove(a) var.ORIGINAL_ROLES[r].add("(dced)"+a) - add_warning(cli, a, var.LEAVE_PENALTY, botconfig.NICK, messages["leave_warning"], expires=var.LEAVE_EXPIRY) if a in var.PLAYERS: var.DCED_PLAYERS[a] = var.PLAYERS.pop(a)