Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Fixed join/part being relayed bug

Browse Source
This commit is contained in:
Jeremy Fincher 2003-03-27 09:14:00 +00:00
parent e3cf5753af
commit da27691eac
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Relay.py
View File

@ -138,6 +138,8 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg):
def doJoin(self, irc, msg): def doJoin(self, irc, msg):
if self.started: if self.started:
if not isinstance(irc, irclib.Irc):
irc = irc.getRealIrc()
channels = msg.args[0].split(',') channels = msg.args[0].split(',')
abbreviation = self.abbreviations[irc] abbreviation = self.abbreviations[irc]
s = '%s has joined on %s' % (msg.nick, abbreviation) s = '%s has joined on %s' % (msg.nick, abbreviation)
@ -149,6 +151,8 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg):
def doPart(self, irc, msg): def doPart(self, irc, msg):
if self.started: if self.started:
if not isinstance(irc, irclib.Irc):
irc = irc.getRealIrc()
channels = msg.args[0].split(',') channels = msg.args[0].split(',')
abbreviation = self.abbreviations[irc] abbreviation = self.abbreviations[irc]
s = '%s has left on %s' % (msg.nick, abbreviation) s = '%s has left on %s' % (msg.nick, abbreviation)
@ -160,6 +164,8 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg):
otherIrc.queueMsg(ircmsgs.privmsg(channel, s)) otherIrc.queueMsg(ircmsgs.privmsg(channel, s))
def outFilter(self, irc, msg): def outFilter(self, irc, msg):
if not isinstance(irc, irclib.Irc):
irc = irc.getRealIrc()
if msg.command == 'PRIVMSG': if msg.command == 'PRIVMSG':
abbreviations = self.abbreviations.values() abbreviations = self.abbreviations.values()
rPrivmsg = re.compile(r'<[^@]+@(?:%s)>' % '|'.join(abbreviations)) rPrivmsg = re.compile(r'<[^@]+@(?:%s)>' % '|'.join(abbreviations))