val
/
ubuntu-bots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Fix the doubling of commands when supybot.defaultIgnore is true and a user is identified

This commit is contained in:
Terence Simpson 2009-11-07 08:50:16 +00:00
parent 31c41dac21
commit f96f9c5bc3
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lart/plugin.py
View File

@ -150,9 +150,8 @@ class Lart(plugins.ChannelIdDatabasePlugin):
if checkIgnored(msg.prefix):
return msg
try:
id = ircdb.users.getUserId(msg.prefix)
user = users.getUser(id)
return msg
if ircdb.users.getUser(msg.prefix):
return msg
except:
pass
cmd, args = (s.split(None, 1) + [None])[:2]

5
Mess/plugin.py
View File

@ -257,9 +257,8 @@ class Mess(callbacks.PluginRegexp):
if checkIgnored(msg.prefix):
return msg
try:
id = ircdb.users.getUserId(msg.prefix)
user = users.getUser(id)
return msg
if ircdb.users.getUser(msg.prefix):
return msg
except:
pass
cmd, args = (s.split(None, 1) + [None])[:2]

12
Webcal/plugin.py
View File

@ -22,12 +22,6 @@ import supybot.ircmsgs as ircmsgs
import supybot.ircdb as ircdb
import supybot.conf as conf
try:
import supybot.plugin as plugin
LoggerWrapper = plugin.loadPluginModule("IRCLog", False).LoggerWrapper
except Exception, e:
def LoggerWrapper(self): return self.log
def checkIgnored(hostmask, recipient='', users=ircdb.users, channels=ircdb.channels):
if ircdb.ignores.checkIgnored(hostmask):
return True
@ -77,7 +71,6 @@ class Webcal(callbacks.Plugin):
def __init__(self, irc):
parent = super(Webcal, self)
parent.__init__(irc)
self.log = LoggerWrapper(self)
self.irc = irc
self.cache = {}
self.firstevent = {}
@ -314,9 +307,8 @@ class Webcal(callbacks.Plugin):
if checkIgnored(msg.prefix):
return msg
try:
id = ircdb.users.getUserId(msg.prefix)
user = ircdb.users.getUser(id)
return msg
if ircdb.users.getUser(msg.prefix):
return msg
except:
pass
cmd, args = (s.split(None, 1) + [None])[:2]