Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 22:51:01 +01:00
Code Issues Projects Releases Wiki Activity

Forgot an irc argument.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-09-12 20:36:36 +00:00
parent 3a57d3ee7a
commit 9ff5f051bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/MoobotFactoids.py
View File

@ -368,7 +368,7 @@ class MoobotFactoids(callbacks.Privmsg):
if 'is' in tokens or '_is_' in tokens: if 'is' in tokens or '_is_' in tokens:
self.addFactoid(irc, msg, tokens) self.addFactoid(irc, msg, tokens)
def _getUserId(self, prefix): def _getUserId(self, irc, prefix):
try: try:
return ircdb.users.getUserId(prefix) return ircdb.users.getUserId(prefix)
except KeyError: except KeyError:
@ -404,7 +404,7 @@ class MoobotFactoids(callbacks.Privmsg):
r"^(?!\x01)(.+?)\s+(?:is|_is_)\s+(.+)" r"^(?!\x01)(.+?)\s+(?:is|_is_)\s+(.+)"
# First, check and see if the entire message matches a factoid key # First, check and see if the entire message matches a factoid key
channel = getChannel(msg) channel = getChannel(msg)
id = self._getUserId(msg.prefix) id = self._getUserId(irc, msg.prefix)
(key, fact) = self._getKeyAndFactoid(tokens) (key, fact) = self._getKeyAndFactoid(tokens)
# Check and make sure it's not in the DB already # Check and make sure it's not in the DB already
if self.db.getFactoid(channel, key): if self.db.getFactoid(channel, key):
@ -414,7 +414,7 @@ class MoobotFactoids(callbacks.Privmsg):
def changeFactoid(self, irc, msg, tokens): def changeFactoid(self, irc, msg, tokens):
r"(.+)\s+=~\s+(.+)" r"(.+)\s+=~\s+(.+)"
id = self._getUserId(msg.prefix) id = self._getUserId(irc, msg.prefix)
(key, regexp) = map(' '.join, (key, regexp) = map(' '.join,
utils.itersplit('=~'.__eq__, tokens, maxsplit=1)) utils.itersplit('=~'.__eq__, tokens, maxsplit=1))
channel = getChannel(msg) channel = getChannel(msg)
@ -434,7 +434,7 @@ class MoobotFactoids(callbacks.Privmsg):
def augmentFactoid(self, irc, msg, tokens): def augmentFactoid(self, irc, msg, tokens):
r"(.+?) is also (.+)" r"(.+?) is also (.+)"
# Must be registered! # Must be registered!
id = self._getUserId(msg.prefix) id = self._getUserId(irc, msg.prefix)
pairs = list(window(tokens, 2)) pairs = list(window(tokens, 2))
isAlso = pairs.index(['is', 'also']) isAlso = pairs.index(['is', 'also'])
key = ' '.join(tokens[:isAlso]) key = ' '.join(tokens[:isAlso])
@ -452,7 +452,7 @@ class MoobotFactoids(callbacks.Privmsg):
r"^no,?\s+(.+?)\s+is\s+(.+)" r"^no,?\s+(.+?)\s+is\s+(.+)"
# Must be registered! # Must be registered!
channel = getChannel(msg) channel = getChannel(msg)
id = self._getUserId(msg.prefix) id = self._getUserId(irc, msg.prefix)
del tokens[0] # remove the "no," del tokens[0] # remove the "no,"
(key, fact) = self._getKeyAndFactoid(tokens) (key, fact) = self._getKeyAndFactoid(tokens)
_ = self._getFactoid(channel, key) # Complains if not already in db. _ = self._getFactoid(channel, key) # Complains if not already in db.
@ -700,7 +700,7 @@ class MoobotFactoids(callbacks.Privmsg):
""" """
channel = getChannel(msg, args) channel = getChannel(msg, args)
key = privmsgs.getArgs(args) key = privmsgs.getArgs(args)
_ = self._getUserId(msg.prefix) _ = self._getUserId(irc, msg.prefix)
_ = self._getFactoid(channel, key) _ = self._getFactoid(channel, key)
self._checkNotLocked(irc, channel, key) self._checkNotLocked(irc, channel, key)
self.db.removeFactoid(channel, key) self.db.removeFactoid(channel, key)