From cb1cd2599557d925a57c9ddcf3b55ba890ed9f53 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Mon, 2 Aug 2004 11:19:58 +0000 Subject: [PATCH] Let's actually respect the channel-value-ness of reply.whenAddressedByNick. --- src/callbacks.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/callbacks.py b/src/callbacks.py index 6f74a7d6e..a2a4a67d1 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -71,13 +71,14 @@ def addressed(nick, msg, prefixChars=None, whenAddressedByNick=None): """ assert msg.command == 'PRIVMSG' (target, payload) = msg.args - registryPrefixChars = conf.supybot.prefixChars - if ircutils.isChannel(target): - registryPrefixChars = conf.supybot.prefixChars.get(target) + def get(group): + if ircutils.isChannel(target): + group = group.get(target) + return group() if prefixChars is None: - prefixChars = registryPrefixChars() + prefixChars = get(conf.supybot.prefixChars) if whenAddressedByNick is None: - whenAddressedByNick = conf.supybot.reply.whenAddressedByNick() + whenAddressedByNick = get(conf.supybot.reply.whenAddressedByNick) nick = ircutils.toLower(nick) # Ok, let's see if it's a private message. if ircutils.nickEqual(target, nick):