From b23f17cd759c835c59c43befc429bbb3be9ad8ad Mon Sep 17 00:00:00 2001 From: skizzerz Date: Mon, 12 Sep 2016 23:39:11 -0500 Subject: [PATCH] Delay stasis until warning is acked --- src/db.py | 6 +----- src/warnings.py | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/db.py b/src/db.py index e7862b9..01d12fc 100644 --- a/src/db.py +++ b/src/db.py @@ -667,11 +667,7 @@ def add_warning_sanction(warning, sanction, data): VALUES (?, ?, ?)""", (warning, sanction, data)) - if sanction == "stasis": - c.execute("SELECT target FROM warning WHERE id = ?", (warning,)) - peid = c.fetchone()[0] - _set_stasis(int(data), peid, relative=True) - elif sanction == "tempban": + if sanction == "tempban": # we want to return a list of all banned accounts/hostmasks idlist = set() acclist = set() diff --git a/src/warnings.py b/src/warnings.py index c541031..18fd8ae 100644 --- a/src/warnings.py +++ b/src/warnings.py @@ -445,6 +445,8 @@ def warn(cli, nick, chan, rest): reply(cli, nick, chan, messages["fwarn_invalid_warning"]) return + if warning["sanctions"].get("stasis", 0) > 0: + db.set_stasis(warning["sanctions"]["stasis"], acc, hm, relative=True) db.acknowledge_warning(warn_id) reply(cli, nick, chan, messages["fwarn_done"]) return