From e3cf5753af3e5db9d3f350cedb98ce90dbacd6fc Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Thu, 27 Mar 2003 08:56:34 +0000 Subject: [PATCH] Fixed problem with actions being relayed back to the original network --- plugins/Relay.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Relay.py b/plugins/Relay.py index 3c36b7de0..57f578f64 100644 --- a/plugins/Relay.py +++ b/plugins/Relay.py @@ -162,8 +162,9 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg): def outFilter(self, irc, msg): if msg.command == 'PRIVMSG': abbreviations = self.abbreviations.values() - r = re.compile(r'<[^@]+@(?:%s)>' % '|'.join(abbreviations)) - if not r.match(msg.args[1]): + rPrivmsg = re.compile(r'<[^@]+@(?:%s)>' % '|'.join(abbreviations)) + rAction = re.compile(r'* \w+/(?:%s) ' % '|'.join(abbreviations)) + if not (rPrivmsg.match(msg.args[1]) or rAction.match(msg.args[1])): channel = msg.args[0] abbreviation = self.abbreviations[irc] s = self._formatPrivmsg(irc.nick, abbreviation, msg)