Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-06 19:38:50 +02:00
Code Issues Projects Releases Wiki Activity

Should be a fix for the double relaying of topics.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-10-24 07:34:30 +00:00
parent 383559e479
commit 2d0be46cd0
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/Relay.py
View File

@ -53,7 +53,7 @@ import supybot.ircmsgs as ircmsgs
import supybot.ircutils as ircutils
import supybot.registry as registry
import supybot.callbacks as callbacks
from supybot.structures import RingBuffer
from supybot.structures import RingBuffer, MultiSet
def configure(advanced):
from supybot.questions import output, expect, anything, something, yn
@ -102,6 +102,7 @@ class Relay(callbacks.Privmsg):
self._whois = {}
self.lastmsg = {}
self.ircstates = {}
self.queuedTopics = structures.MultiSet()
self.last20Privmsgs = ircutils.IrcDict()
def __call__(self, irc, msg):
@ -487,14 +488,26 @@ class Relay(callbacks.Privmsg):
def doTopic(self, irc, msg):
irc = self._getRealIrc(irc)
if ircutils.strEqual(msg.nick, irc.nick):
return
(channel, newTopic) = msg.args
if channel not in self.registryValue('channels'):
return
network = self._getIrcName(irc)
if self.registryValue('topicSync', channel):
m = ircmsgs.topic(channel, newTopic)
for otherIrc in world.ircs:
if irc != otherIrc:
try:
if otherIrc.state.getTopic(channel) != newTopic:
if (otherIrc, newTopic) not in self.queuedTopics:
self.queuedTopics.add((otherIrc, newTopic))
otherIrc.queueMsg(m)
else:
self.queuedTopics.remove((otherIrc, newTopic))
except KeyError:
self.log.warning('Not on %s on %s, '
'can\'t sync topics.',
channel, otherIrc.network)
else:
s = 'topic change by %s on %s: %s' % (msg.nick, network, newTopic)
m = ircmsgs.privmsg(channel, s)
@ -523,20 +536,6 @@ class Relay(callbacks.Privmsg):
s = self._formatPrivmsg(irc.nick, network, msg)
relayMsg = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, relayMsg)
elif msg.command == 'TOPIC' and len(msg.args) > 1 and \
self.registryValue('topicSync', msg.args[0]):
(channel, topic) = msg.args
if channel in self.registryValue('channels'):
for otherIrc in world.ircs:
if otherIrc != irc:
try:
if otherIrc.state.getTopic(channel) != topic:
otherIrc.queueMsg(msg)
except KeyError:
self.log.warning('Not on %s on %s -- '
'Can\'t synchronize topics.',
channel, otherIrc.server)
return msg
Class = Relay