From 82d2d8162a96e91910016a1302cabbca5a7a1dd2 Mon Sep 17 00:00:00 2001 From: Daniel DiPaolo Date: Sat, 1 Nov 2003 22:08:52 +0000 Subject: [PATCH] Fixed a bug where addFactoid wasn't splitting on the first "is" --- plugins/MoobotFactoids.py | 2 +- test/test_MoobotFactoids.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/MoobotFactoids.py b/plugins/MoobotFactoids.py index ccdc57a05..2740f2f96 100644 --- a/plugins/MoobotFactoids.py +++ b/plugins/MoobotFactoids.py @@ -212,7 +212,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp): return True def addFactoid(self, irc, msg, match): - r"^(.+)\s+(?:is|_is_)\s+(.+)" + r"^(.+?)\s+(?:is|_is_)\s+(.+)" # First, check and see if the entire message matches a factoid key cursor = self.db.cursor() cursor.execute("""SELECT * FROM factoids WHERE key LIKE %s""", diff --git a/test/test_MoobotFactoids.py b/test/test_MoobotFactoids.py index a203c122c..5e5496778 100644 --- a/test/test_MoobotFactoids.py +++ b/test/test_MoobotFactoids.py @@ -51,6 +51,8 @@ if sqlite is not None: self.assertError('moo!? is foo') # 'moo' already exists self.assertNotError('foo!? is foo') self.assertResponse('foo', 'foo is foo') + self.assertNotError('bar is moo is moo') + self.assertResponse('bar', 'moo is moo') def testLiteral(self): self.assertError('literal moo') # no factoids yet