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

RelayNext: only run flood checking on channels in relays

Browse Source 
This prevents useless "Flood detected" messages from appearing in other, unrelated channels.
This commit is contained in:
James Lu 2015-04-20 16:29:31 -07:00
parent cbece29293
commit 47f59f406d
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
RelayNext/plugin.py
View File

@ -220,35 +220,33 @@ class RelayNext(callbacks.Plugin):
source = source.lower()
out_s = self._format(irc, msg, channel)
if out_s:
### Begin Flood checking clause
if self.registryValue("antiflood.enable", channel):
timeout = self.registryValue("antiflood.timeout", channel)
seconds = self.registryValue("antiflood.seconds", channel)
maximum = self.registryValue("antiflood.maximum", channel)
try:
self.msgcounters[(source, msg.command)].enqueue(msg.prefix)
except KeyError:
self.msgcounters[(source, msg.command)] = TimeoutQueue(seconds)
if self.checkFlood(channel, source, msg.command):
self.log.debug("RelayNext (%s): message from %s blocked by "
"flood protection.", irc.network, channel)
if self.floodTriggered:
return
c = msg.command.lower()
e = format("Flood detected on %s (%s %ss/%s seconds), "
"not relaying %ss for %s seconds!", channel,
maximum, c, seconds, c, timeout)
out_s = self._format(irc, msg, channel, announcement=e)
self.log.info("RelayNext (%s): %s", irc.network, e)
self.floodTriggered = True
else:
self.floodTriggered = False
### End Flood checking clause
for relay in self.db.values():
if source in relay: # If our channel is in a relay
# Remove ourselves so we don't get duplicated messages
targets = list(relay)
targets.remove(source)
if self.registryValue("antiflood.enable", channel):
timeout = self.registryValue("antiflood.timeout", channel)
seconds = self.registryValue("antiflood.seconds", channel)
maximum = self.registryValue("antiflood.maximum", channel)
try:
self.msgcounters[(source, msg.command)].enqueue(msg.prefix)
except KeyError:
self.msgcounters[(source, msg.command)] = TimeoutQueue(seconds)
if self.checkFlood(channel, source, msg.command):
self.log.debug("RelayNext (%s): message from %s blocked by "
"flood protection.", irc.network, channel)
if self.floodTriggered:
return
c = msg.command.lower()
e = format("Flood detected on %s (%s %ss/%s seconds), "
"not relaying %ss for %s seconds!", channel,
maximum, c, seconds, c, timeout)
out_s = self._format(irc, msg, channel, announcement=e)
self.floodTriggered = True
self.log.info("RelayNext (%s): %s", irc.network, e)
else:
self.floodTriggered = False
for cn in targets:
target, net = cn.split("@")
otherIrc = world.getIrc(net)