From eb9bd70599948f8246a7a643548cb5dfac5a5e8a Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Fri, 10 Sep 2004 06:36:27 +0000
Subject: [PATCH] Updated to use the new plugin ordering method.

---
 plugins/Amazon.py         | 2 +-
 plugins/Bugzilla.py       | 1 +
 plugins/Dunno.py          | 2 ++
 plugins/Ebay.py           | 1 +
 plugins/Gameknot.py       | 1 +
 plugins/Geekquote.py      | 1 +
 plugins/Google.py         | 5 +++--
 plugins/MoobotFactoids.py | 2 +-
 plugins/Python.py         | 3 ++-
 plugins/Sourceforge.py    | 1 +
 10 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugins/Amazon.py b/plugins/Amazon.py
index ec89458d2..0a654d6bf 100644
--- a/plugins/Amazon.py
+++ b/plugins/Amazon.py
@@ -87,8 +87,8 @@ conf.registerChannelValue(conf.supybot.plugins.Amazon, 'linkSnarfer',
 
 class Amazon(callbacks.PrivmsgCommandAndRegexp):
     threaded = True
+    callBefore = ['URL']
     regexps = ['amzSnarfer']
-
     def callCommand(self, name, irc, msg, *L, **kwargs):
         try:
             super(Amazon, self).callCommand(name, irc, msg, *L, **kwargs)
diff --git a/plugins/Bugzilla.py b/plugins/Bugzilla.py
index 00dfbf0ce..02c477918 100644
--- a/plugins/Bugzilla.py
+++ b/plugins/Bugzilla.py
@@ -118,6 +118,7 @@ def registerBugzilla(name, url='', description=''):
 class Bugzilla(callbacks.PrivmsgCommandAndRegexp):
     """Show a link to a bug report with a brief description"""
     threaded = True
+    callBefore = ['URL']
     regexps = ['bzSnarfer', 'bugzSnarf']
 
     def __init__(self):
diff --git a/plugins/Dunno.py b/plugins/Dunno.py
index bdba31600..46a2444dd 100644
--- a/plugins/Dunno.py
+++ b/plugins/Dunno.py
@@ -138,6 +138,8 @@ class Dunno(callbacks.Privmsg):
     messages with messages kept in a database, able to give more personable
     responses."""
     priority = 100
+    callBefore = ['Misc']
+    callAfter = ['MoobotFactoids']
     def __init__(self):
         callbacks.Privmsg.__init__(self)
         self.db = DunnoDB()
diff --git a/plugins/Ebay.py b/plugins/Ebay.py
index 10b2793ea..0e1560c31 100644
--- a/plugins/Ebay.py
+++ b/plugins/Ebay.py
@@ -77,6 +77,7 @@ class Ebay(callbacks.PrivmsgCommandAndRegexp):
     get info about an auction.
     """
     threaded = True
+    callBefore = ['URL']
     regexps = ['ebaySnarfer']
 
     _reopts = re.I | re.S
diff --git a/plugins/Gameknot.py b/plugins/Gameknot.py
index b0f4fd74f..c1c21efcc 100644
--- a/plugins/Gameknot.py
+++ b/plugins/Gameknot.py
@@ -78,6 +78,7 @@ conf.registerChannelValue(conf.supybot.plugins.Gameknot, 'statSnarfer',
 
 class Gameknot(callbacks.PrivmsgCommandAndRegexp):
     threaded = True
+    callBefore = ['URL']
     regexps = ['gameknotSnarfer', 'gameknotStatsSnarfer']
     _gkrating = re.compile(r'<font color="#FFFF33">(\d+)</font>')
     _gkgames = re.compile(r's:</td><td class=sml>(\d+)</td></tr>')
diff --git a/plugins/Geekquote.py b/plugins/Geekquote.py
index 6313c478b..52b6436f4 100644
--- a/plugins/Geekquote.py
+++ b/plugins/Geekquote.py
@@ -74,6 +74,7 @@ conf.registerChannelValue(conf.supybot.plugins.Geekquote, 'geekSnarfer',
 
 class Geekquote(callbacks.PrivmsgCommandAndRegexp):
     threaded = True
+    callBefore = ['URL']
     regexps = ['geekSnarfer']
 
     def callCommand(self, method, irc, msg, *L, **kwargs):
diff --git a/plugins/Google.py b/plugins/Google.py
index a4d38b559..5b51acb1d 100644
--- a/plugins/Google.py
+++ b/plugins/Google.py
@@ -192,7 +192,8 @@ totalTime = conf.supybot.plugins.Google.state.time()
 
 class Google(callbacks.PrivmsgCommandAndRegexp):
     threaded = True
-    regexps = sets.Set(['googleSnarfer', 'googleGroups'])
+    callBefore = ['URL']
+    regexps = ['googleSnarfer', 'googleGroups']
     def __init__(self):
         callbacks.PrivmsgCommandAndRegexp.__init__(self)
         self.last24hours = structures.TimeoutQueue(86400)
@@ -390,7 +391,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
         if not self.registryValue('groupsSnarfer', msg.args[0]):
             return
         queries = cgi.parse_qsl(match.group(1))
-        queries = filter(lambda q: q[0] in ['threadm', 'selm'], queries)
+        queries = [q for q in queries if q[0] in ('threadm', 'selm')]
         if not queries:
             return
         queries.append(('hl', 'en'))
diff --git a/plugins/MoobotFactoids.py b/plugins/MoobotFactoids.py
index 26ff24e26..15c82833c 100644
--- a/plugins/MoobotFactoids.py
+++ b/plugins/MoobotFactoids.py
@@ -310,7 +310,7 @@ def MoobotDB():
     return SqliteMoobotDB()
 
 class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
-    priority = 98
+    callBefore = ['Dunno']
     addressedRegexps = ['changeFactoid', 'augmentFactoid',
                         'replaceFactoid', 'addFactoid']
     def __init__(self):
diff --git a/plugins/Python.py b/plugins/Python.py
index dd4c02219..7062fc9eb 100644
--- a/plugins/Python.py
+++ b/plugins/Python.py
@@ -85,8 +85,9 @@ conf.registerChannelValue(conf.supybot.plugins.Python, 'aspnSnarfer',
     the recipe when it see an ASPN Python recipe link on the channel."""))
 
 class Python(callbacks.PrivmsgCommandAndRegexp):
-    modulechars = '%s%s%s' % (string.ascii_letters, string.digits, '_.')
+    callBefore = ['URL']
     regexps = ['aspnRecipes']
+    modulechars = string.ascii_letters + string.digits + '_.'
     def pydoc(self, irc, msg, args):
         """<python function>
 
diff --git a/plugins/Sourceforge.py b/plugins/Sourceforge.py
index 0bc2ab6cf..c140753fe 100644
--- a/plugins/Sourceforge.py
+++ b/plugins/Sourceforge.py
@@ -105,6 +105,7 @@ class Sourceforge(callbacks.PrivmsgCommandAndRegexp):
     project's most recent bugs and rfes.
     """
     threaded = True
+    callBefore = ['URL']
     regexps = ['sfSnarfer']
 
     _reopts = re.I