Fix !warn ack duplicating stasis, remove !fquit warning
This commit is contained in:
parent
cfcc37f9c9
commit
f5d510374a
@ -445,7 +445,8 @@ def warn(cli, nick, chan, rest):
|
|||||||
reply(cli, nick, chan, messages["fwarn_invalid_warning"])
|
reply(cli, nick, chan, messages["fwarn_invalid_warning"])
|
||||||
return
|
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.set_stasis(warning["sanctions"]["stasis"], acc, hm, relative=True)
|
||||||
db.init_vars()
|
db.init_vars()
|
||||||
db.acknowledge_warning(warn_id)
|
db.acknowledge_warning(warn_id)
|
||||||
|
@ -1318,7 +1318,6 @@ def fleave(cli, nick, chan, rest):
|
|||||||
if a in rset:
|
if a in rset:
|
||||||
var.ORIGINAL_ROLES[r].remove(a)
|
var.ORIGINAL_ROLES[r].remove(a)
|
||||||
var.ORIGINAL_ROLES[r].add("(dced)"+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:
|
if a in var.PLAYERS:
|
||||||
var.DCED_PLAYERS[a] = var.PLAYERS.pop(a)
|
var.DCED_PLAYERS[a] = var.PLAYERS.pop(a)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user