From 7b28caba1b6dd54825af8da479201d2bde4dd6ad Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Thu, 9 Oct 2003 05:08:18 +0000 Subject: [PATCH] Converted karma stuff to use addressedRegexps. --- plugins/ChannelDB.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/plugins/ChannelDB.py b/plugins/ChannelDB.py index e21a675b1..4404f053b 100644 --- a/plugins/ChannelDB.py +++ b/plugins/ChannelDB.py @@ -77,7 +77,7 @@ smileyre = re.compile('|'.join(map(re.escape, smileys))) frownre = re.compile('|'.join(map(re.escape, frowns))) class ChannelDB(plugins.ChannelDBHandler, callbacks.PrivmsgCommandAndRegexp): - regexps = sets.Set(['increaseKarma', 'decreaseKarma']) + addressedRegexps = sets.Set(['increaseKarma', 'decreaseKarma']) def __init__(self): plugins.ChannelDBHandler.__init__(self) callbacks.PrivmsgCommandAndRegexp.__init__(self) @@ -365,20 +365,16 @@ class ChannelDB(plugins.ChannelDBHandler, callbacks.PrivmsgCommandAndRegexp): irc.reply(msg, s) def increaseKarma(self, irc, msg, match): - r"^(.)(\S+)\+\+$" - (first, name) = match.groups() - if first not in conf.prefixChars: - return + r"^(\S+)\+\+$" + name = match.group(1) db = self.getDb(msg.args[0]) cursor = db.cursor() cursor.execute("""INSERT INTO karma VALUES (NULL, %s, 0, 0)""", name) cursor.execute("""UPDATE karma SET added=added+1 WHERE name=%s""",name) def decreaseKarma(self, irc, msg, match): - r"^(.)(\S+)--$" - (first, name) = match.groups() - if first not in conf.prefixChars: - return + r"^(\S+)--$" + name = match.group(1) db = self.getDb(msg.args[0]) cursor = db.cursor() cursor.execute("""INSERT INTO karma VALUES (NULL, %s, 0, 0)""", name)