From 2ef78a9783b4089ad56bc81a5d1c1916b69a211c Mon Sep 17 00:00:00 2001 From: Lukas Martini Date: Fri, 4 Dec 2015 06:07:05 +0100 Subject: [PATCH] Hide commands in deadchat --- src/wolfgame.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/wolfgame.py b/src/wolfgame.py index 944eaaa..ec01a24 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -6462,16 +6462,19 @@ def relay(cli, nick, chan, rest): badguys = var.list_players(var.WOLFCHAT_ROLES) wolves = var.list_players(var.WOLF_ROLES) - if nick not in pl: - if var.ENABLE_DEADCHAT and nick in var.DEADCHAT_PLAYERS: - to_msg = var.DEADCHAT_PLAYERS - {nick} - if rest.startswith("\u0001ACTION"): - rest = rest[7:-1] - mass_privmsg(cli, to_msg, "* \u0002{0}\u0002{1}".format(nick, rest)) - mass_privmsg(cli, var.SPECTATING_DEADCHAT, "* [deadchat] \u0002{0}\u0002{1}".format(nick, rest)) - else: - mass_privmsg(cli, to_msg, "\u0002{0}\u0002 says: {1}".format(nick, rest)) - mass_privmsg(cli, var.SPECTATING_DEADCHAT, "[deadchat] \u0002{0}\u0002 says: {1}".format(nick, rest)) + if nick not in pl and var.ENABLE_DEADCHAT and nick in var.DEADCHAT_PLAYERS: + to_msg = var.DEADCHAT_PLAYERS - {nick} + + if rest.startswith(botconfig.CMD_CHAR): + return + + if rest.startswith("\u0001ACTION"): + rest = rest[7:-1] + mass_privmsg(cli, to_msg, "* \u0002{0}\u0002{1}".format(nick, rest)) + mass_privmsg(cli, var.SPECTATING_DEADCHAT, "* [deadchat] \u0002{0}\u0002{1}".format(nick, rest)) + else: + mass_privmsg(cli, to_msg, "\u0002{0}\u0002 says: {1}".format(nick, rest)) + mass_privmsg(cli, var.SPECTATING_DEADCHAT, "[deadchat] \u0002{0}\u0002 says: {1}".format(nick, rest)) elif nick in badguys and len(badguys) > 1: # handle wolfchat toggles