Let's try this location for our placement of a dynamic channel.

This commit is contained in:
Jeremy Fincher 2004-12-17 06:02:10 +00:00
parent 3b2ef3d88f
commit bc5e7de336
2 changed files with 4 additions and 4 deletions

View File

@ -1081,10 +1081,6 @@ class Privmsg(irclib.IrcCallback):
def __call__(self, irc, msg):
# This is for later dynamic scoping.
if msg.args and irc.isChannel(msg.args[0]):
channel = msg.args[0]
else:
channel = None
if msg.command == 'PRIVMSG':
if self.noIgnore or not ircdb.checkIgnored(msg.prefix,msg.args[0]):
self.__parent.__call__(irc, msg)

View File

@ -733,6 +733,10 @@ class Irc(IrcCommandDispatcher):
"""Called by the IrcDriver; feeds a message received."""
msg.tag('receivedBy', self)
msg.tag('receivedOn', self.network)
if msg.args and self.isChannel(msg.args[0]):
channel = msg.args[0]
else:
channel = None
log.debug('Incoming message: ' + str(msg).rstrip('\r\n'))
# Yeah, so this is odd. Some networks (oftc) seem to give us certain