From 694f0519941005da331d17dc15dc8a10e8e750f1 Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Fri, 29 Oct 2010 13:08:48 -0500 Subject: [PATCH] allow karma to happen anywhere in a sentence (rather than just the start), switch to re.search() throughout --- modules/Karma.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/Karma.py b/modules/Karma.py index 093ac8f..04b6f0f 100644 --- a/modules/Karma.py +++ b/modules/Karma.py @@ -34,7 +34,7 @@ class Karma(Module): Module.__init__(self, config, server, modlist) pattern = "(?:([a-zA-Z0-9_'.,]+)|\(([a-zA-Z0-9_'., ]+)\))" - karmapattern = '^' + pattern + '(\+\+|--)' + karmapattern = pattern + '(\+\+|--)' querypattern = '^rank\s+(.*)' self.karmare = re.compile(karmapattern) @@ -75,16 +75,16 @@ class Karma(Module): def do(self, connection, event, nick, userhost, replypath, what, admin_unlocked): """look for karma strings at the start of messages""" - if (self.karmare.match(what)): + if (self.karmare.search(what)): return self.handle_karma_change(connection, nick, userhost, replypath, what) - elif (self.queryre.match(what)): + elif (self.queryre.search(what)): return self.handle_karma_query(connection, nick, userhost, replypath, what) def handle_karma_change(self, connection, nick, userhost, replypath, what): """ handle the karma change and storage. """ - match = self.karmare.match(what) + match = self.karmare.search(what) key = match.group(1) if match.group(1) else match.group(2) value = match.group(3) if (value == '++'): @@ -105,7 +105,7 @@ class Karma(Module): return self.reply(connection, replypath, "sqlite error: " + str(e)) def handle_karma_query(self, connection, nick, userhost, replypath, what): - match = self.queryre.match(what) + match = self.queryre.search(what) key = match.group(1) conn = self.get_db()