PsychoticNinja/JLU5-SupyPlugins
1
0
Fork 0
mirror of https://github.com/jlu5/SupyPlugins.git synced 2025-05-01 07:51:08 -05:00
Code Issues Projects Releases Wiki Activity

RelayNext: make channel a mandatory argument to relay()

Browse Source 
Messages where this is not set correctly are thrown away anyways.
This commit is contained in:
James Lu 2020-12-19 23:35:01 +01:00
parent 5c9a9a9aab
commit ecf52180b0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RelayNext/plugin.py
View File

@ -237,8 +237,8 @@ class RelayNext(callbacks.Plugin):
s = "\x02[%s]\x02 %s" % (netname, s) s = "\x02[%s]\x02 %s" % (netname, s)
return s return s
def relay(self, irc, msg, channel=None): def relay(self, irc, msg, channel):
channel = (channel or msg.args[0]).lower() channel = channel.lower()
self.log.debug("RelayNext (%s): got channel %s", irc.network, channel) self.log.debug("RelayNext (%s): got channel %s", irc.network, channel)
if not channel in irc.state.channels: if not channel in irc.state.channels:
return return
@ -345,11 +345,12 @@ class RelayNext(callbacks.Plugin):
otherIrc.queueMsg(out_msg) otherIrc.queueMsg(out_msg)
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
self.relay(irc, msg) self.relay(irc, msg, channel=msg.args[0])
def doNonPrivmsg(self, irc, msg): def doNonPrivmsg(self, irc, msg):
if self.registryValue("events.relay%ss" % msg.command, msg.args[0]): channel = msg.args[0]
self.relay(irc, msg) if self.registryValue("events.relay%ss" % msg.command, channel):
self.relay(irc, msg, channel)
doTopic = doPart = doKick = doMode = doJoin = doNonPrivmsg doTopic = doPart = doKick = doMode = doJoin = doNonPrivmsg
@ -358,12 +359,12 @@ class RelayNext(callbacks.Plugin):
def doNick(self, irc, msg): def doNick(self, irc, msg):
for channel in msg.tagged('channels'): for channel in msg.tagged('channels'):
if self.registryValue("events.relaynicks", channel): if self.registryValue("events.relaynicks", channel):
self.relay(irc, msg, channel=channel) self.relay(irc, msg, channel)
def doQuit(self, irc, msg): def doQuit(self, irc, msg):
for channel in msg.tagged('channels'): for channel in msg.tagged('channels'):
if self.registryValue("events.relayquits", channel): if self.registryValue("events.relayquits", channel):
self.relay(irc, msg, channel=channel) self.relay(irc, msg, channel)
def outFilter(self, irc, msg): def outFilter(self, irc, msg):
# Catch our own messages and send them into the relay (this is # Catch our own messages and send them into the relay (this is