diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 54912b6..6a73961 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -183,14 +183,14 @@ def pm(cli, target, message): # message either privmsg or notice, depending on cli.msg(target, message) -def log_cmd(raw_nick, command, args, text): +def log_cmd(raw_nick, command, ptext, text): (nick, _, user, host) = parse_nick(raw_nick) msg = "[{0}] {1} ({2}@{3}) {4}".format( time.strftime("%Y-%m-%d %H:%M:%S%z"), nick, user, host, command) - if args: - msg += " {0}".format(" ".join(args)) + if ptext: + msg += " " + ptext if text: msg += ": " + text @@ -6121,13 +6121,13 @@ def fpull_pm(cli, nick, rest): @pmcmd("fsend", admin_only=True, raw_nick=True) def fsend(cli, raw_nick, rest): - log_cmd(raw_nick, "fsend", (), rest) + log_cmd(raw_nick, "fsend", "", rest) cli.send(rest) def _say(cli, raw_nick, rest, command, action=False): - (nick, _, _, _) = parse_nick(raw_nick) + nick = parse_nick(raw_nick)[0] rest = rest.split(" ", 1) if len(rest) < 2: @@ -6151,7 +6151,7 @@ def _say(cli, raw_nick, rest, command, action=False): return - log_cmd(raw_nick, command, (target,), message) + log_cmd(raw_nick, command, target, message) if action: message = "\x01ACTION {0}\x01".format(message)