Fixed problem with actions being relayed back to the original network

This commit is contained in:
Jeremy Fincher 2003-03-27 08:56:34 +00:00
parent f32efbf2b2
commit e3cf5753af

View File

@ -162,8 +162,9 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg):
def outFilter(self, irc, msg): def outFilter(self, irc, msg):
if msg.command == 'PRIVMSG': if msg.command == 'PRIVMSG':
abbreviations = self.abbreviations.values() abbreviations = self.abbreviations.values()
r = re.compile(r'<[^@]+@(?:%s)>' % '|'.join(abbreviations)) rPrivmsg = re.compile(r'<[^@]+@(?:%s)>' % '|'.join(abbreviations))
if not r.match(msg.args[1]): 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] channel = msg.args[0]
abbreviation = self.abbreviations[irc] abbreviation = self.abbreviations[irc]
s = self._formatPrivmsg(irc.nick, abbreviation, msg) s = self._formatPrivmsg(irc.nick, abbreviation, msg)