From 8dddd4c3b09b5a643d4046ce475fa93b3807ea9e Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sat, 3 Sep 2016 21:58:57 +0200 Subject: [PATCH] Move other nicks to be kicked to guest nick pattern --- src/settings.py | 2 +- src/wolfgame.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.py b/src/settings.py index 421217b..a34966d 100644 --- a/src/settings.py +++ b/src/settings.py @@ -197,7 +197,7 @@ NICKSERV_REGAIN_COMMAND = "REGAIN {nick}" CHANSERV = "ChanServ" CHANSERV_OP_COMMAND = "OP {channel}" -GUEST_NICK_PATTERN = r"^Guest\d+$" +GUEST_NICK_PATTERN = r"^Guest\d+$|^\d|away.+|.+away" LOG_CHANNEL = "" # Log !fwarns to this channel, if set diff --git a/src/wolfgame.py b/src/wolfgame.py index 32ba4f2..0765edd 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -3504,7 +3504,7 @@ def on_nick(cli, oldnick, nick): prefix, _, ident, host = parse_nick(oldnick) chan = botconfig.CHANNEL - if (re.search(var.GUEST_NICK_PATTERN, nick) or nick[0].isdigit() or (nick != "away" and "away" in nick.lower())) and nick not in var.DISCONNECTED.keys() and prefix in list_players(): + if re.search(var.GUEST_NICK_PATTERN, nick) and nick not in var.DISCONNECTED.keys() and prefix in list_players(): if var.PHASE != "join": cli.mode(chan, "-v", nick) leave(cli, "badnick", oldnick)