Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

(Hopefully) fixed joins-being-sent-to-original-channel bug.

This commit is contained in:
Jeremy Fincher 2003-03-27 20:32:49 +00:00
parent b615955fbd
commit f1823ef5f5
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/Relay.py
View File

@ -145,27 +145,29 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg):
if self.started:
if not isinstance(irc, irclib.Irc):
irc = irc.getRealIrc()
channels = msg.args[0].split(',')
channel = msg.args[0]
if channel not in self.channels:
return
abbreviation = self.abbreviations[irc]
s = '%s has joined on %s' % (msg.nick, abbreviation)
for otherIrc in self.ircs.itervalues():
if otherIrc != irc:
for channel in channels:
if channel in otherIrc.state.channels:
otherIrc.queueMsg(ircmsgs.privmsg(channel, s))
if channel in otherIrc.state.channels:
otherIrc.queueMsg(ircmsgs.privmsg(channel, s))
def doPart(self, irc, msg):
if self.started:
if not isinstance(irc, irclib.Irc):
irc = irc.getRealIrc()
channels = msg.args[0].split(',')
channel = msg.args[0]
if channel not in self.channels:
return
abbreviation = self.abbreviations[irc]
s = '%s has left on %s' % (msg.nick, abbreviation)
for otherIrc in self.ircs.itervalues():
if otherIrc != irc:
for channel in channels:
if channel in otherIrc.state.channels:
otherIrc.queueMsg(ircmsgs.privmsg(channel, s))
if channel in otherIrc.state.channels:
otherIrc.queueMsg(ircmsgs.privmsg(channel, s))
def outFilter(self, irc, msg):
if not isinstance(irc, irclib.Irc):
@ -173,8 +175,11 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg):
if msg.command == 'PRIVMSG':
abbreviations = self.abbreviations.values()
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])):
rAction = re.compile(r'\* [^/]+/(?:%s) ' % '|'.join(abbreviations))
if not (rPrivmsg.match(msg.args[1]) or \
rAction.match(msg.args[1]) or \
msg.args[1].find('has left on ') != -1 or \
msg.args[1].find('has joined on ') != -1):
channel = msg.args[0]
if channel not in self.channels:
return