RelayLink: bugfix

This commit is contained in:
GLolol 2014-07-10 15:39:20 -07:00
parent 5b3b73847e
commit 2ed597198d

View File

@ -262,6 +262,7 @@ class RelayLink(callbacks.Plugin):
s = self.floodDetect() s = self.floodDetect()
if s: if s:
self.sendToOthers(irc, msg.args[0], s, args) self.sendToOthers(irc, msg.args[0], s, args)
self.floodActivated = True
else: return else: return
elif ircutils.toLower(msg.nick) not in ignoreNicks: elif ircutils.toLower(msg.nick) not in ignoreNicks:
self.floodActivated = False self.floodActivated = False
@ -291,6 +292,7 @@ class RelayLink(callbacks.Plugin):
s = self.floodDetect() s = self.floodDetect()
if s: if s:
self.sendToOthers(irc, msg.args[0], s, args) self.sendToOthers(irc, msg.args[0], s, args)
self.floodActivated = True
else: return else: return
elif ircutils.toLower(msg.nick) not in ignoreNicks: elif ircutils.toLower(msg.nick) not in ignoreNicks:
self.floodActivated = False self.floodActivated = False
@ -311,9 +313,10 @@ class RelayLink(callbacks.Plugin):
if self.registryValue("antiflood.enable") and \ if self.registryValue("antiflood.enable") and \
self.registryValue("antiflood.nonprivmsgs") > 0 and \ self.registryValue("antiflood.nonprivmsgs") > 0 and \
(len(self.nonPrivmsgCounter) > self.registryValue("antiflood.nonprivmsgs")): (len(self.nonPrivmsgCounter) > self.registryValue("antiflood.nonprivmsgs")):
s = self.floodDetect() self.floodActivated = True
if s: if s:
self.sendToOthers(irc, msg.args[0], s, args) self.sendToOthers(irc, msg.args[0], s, args)
s = self.floodDetect()
else: return else: return
elif ircutils.toLower(msg.nick) not in ignoreNicks: elif ircutils.toLower(msg.nick) not in ignoreNicks:
self.addIRC(irc) self.addIRC(irc)
@ -340,6 +343,7 @@ class RelayLink(callbacks.Plugin):
s = self.floodDetect() s = self.floodDetect()
if s: if s:
self.sendToOthers(irc, msg.args[0], s, args) self.sendToOthers(irc, msg.args[0], s, args)
self.floodActivated = True
else: return else: return
self.floodActivated = False self.floodActivated = False
if self.registryValue('color', msg.args[0]): if self.registryValue('color', msg.args[0]):
@ -365,6 +369,7 @@ class RelayLink(callbacks.Plugin):
s = self.floodDetect() s = self.floodDetect()
if s: if s:
self.sendToOthers(irc, msg.args[0], s, args) self.sendToOthers(irc, msg.args[0], s, args)
self.floodActivated = True
else: return else: return
self.floodActivated = False self.floodActivated = False
if ircutils.toLower(msg.nick) not in ignoreNicks: if ircutils.toLower(msg.nick) not in ignoreNicks:
@ -389,9 +394,10 @@ class RelayLink(callbacks.Plugin):
elif self.registryValue("antiflood.enable") and \ elif self.registryValue("antiflood.enable") and \
self.registryValue("antiflood.nonprivmsgs") > 0 and \ self.registryValue("antiflood.nonprivmsgs") > 0 and \
(len(self.nonPrivmsgCounter) > self.registryValue("antiflood.nonprivmsgs")): (len(self.nonPrivmsgCounter) > self.registryValue("antiflood.nonprivmsgs")):
s = self.floodDetect() self.floodActivated = True
if s: if s:
self.sendToOthers(irc, msg.args[0], s, args) self.sendToOthers(irc, msg.args[0], s, args)
s = self.floodDetect()
else: return else: return
elif ircutils.toLower(msg.nick) not in ignoreNicks: elif ircutils.toLower(msg.nick) not in ignoreNicks:
if self.registryValue('color'): if self.registryValue('color'):