Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Cleaner implementation of noticeNonPrivmsgs. You'd think the variable name would've clued me in.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-12-21 15:37:54 +00:00
parent c350baa2ae
commit 094e2c15e0
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/Relay.py
View File

@ -422,24 +422,14 @@ class Relay(callbacks.Privmsg):
else: else:
network = self._getIrcName(irc) network = self._getIrcName(irc)
s = self._formatPrivmsg(msg.nick, network, msg) s = self._formatPrivmsg(msg.nick, network, msg)
m = ircmsgs.privmsg(channel, s) m = self._msgmaker(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
_noticeCommands = sets.Set([
'JOIN',
'PART',
'QUIT',
'NICK',
'MODE',
'KICK',
'TOPIC',
'ERROR',
])
def _msgmaker(self, target, s): def _msgmaker(self, target, s):
msg = dynamic.msg msg = dynamic.msg
channel = dynamic.channel channel = dynamic.channel
if self.registryValue('noticeNonPrivmsgs', dynamic.channel) and \ if self.registryValue('noticeNonPrivmsgs', dynamic.channel) and \
msg.command in self._noticeCommands: msg.command != 'PRIVMSG':
return ircmsgs.notice(target, s) return ircmsgs.notice(target, s)
else: else:
return ircmsgs.privmsg(target, s) return ircmsgs.privmsg(target, s)
@ -567,7 +557,7 @@ class Relay(callbacks.Privmsg):
if channel in self.registryValue('channels'): if channel in self.registryValue('channels'):
network = self._getIrcName(irc) network = self._getIrcName(irc)
s = self._formatPrivmsg(irc.nick, network, msg) s = self._formatPrivmsg(irc.nick, network, msg)
relayMsg = ircmsgs.privmsg(channel, s) relayMsg = self._msgmaker(channel, s)
self._sendToOthers(irc, relayMsg) self._sendToOthers(irc, relayMsg)
return msg return msg