diff --git a/markov/ircplugin.py b/markov/ircplugin.py index 63015e0..c1ecc0f 100644 --- a/markov/ircplugin.py +++ b/markov/ircplugin.py @@ -60,15 +60,10 @@ class Markov(Plugin): def handle_chatter(self, connection, event): """Learn from IRC chatter.""" what = event.arguments[0] - if connection.server_config.additional_addressed_nicks: - all_nicks = '|'.join(connection.server_config.additional_addressed_nicks.split('\n') + - [connection.get_nickname()]) - else: - all_nicks = connection.get_nickname() - trimmed_what = re.sub(r'^(({nicks})[:,]|@({nicks}))\s+'.format(nicks=all_nicks), '', what) nick = irc.client.NickMask(event.source).nick target = reply_destination_for_event(event) + log.debug("what: '%s', nick: '%s', target: '%s'", what, nick, target) # check to see whether or not we should learn from this channel channel = None if irc.client.is_channel(target): @@ -78,6 +73,12 @@ class Markov(Plugin): log.debug("not learning from %s as i've been told to ignore it", channel) else: # learn the line + if connection.server_config.additional_addressed_nicks: + all_nicks = '|'.join(connection.server_config.additional_addressed_nicks.split('\n') + + [connection.get_nickname()]) + else: + all_nicks = connection.get_nickname() + trimmed_what = re.sub(r'^(({nicks})[:,]|@({nicks}))\s+'.format(nicks=all_nicks), '', what) recursing = getattr(event, 'recursing', False) if not recursing: log.debug("learning %s", trimmed_what)