From 62cc0490d10df8bde9f393cc928cfe50c8b575a2 Mon Sep 17 00:00:00 2001 From: Ryan Hitchman Date: Tue, 6 Apr 2010 02:36:43 -0600 Subject: [PATCH] add simple plugin disable config option --- plugins/sieve.py | 7 +++++++ plugins/tag.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/sieve.py b/plugins/sieve.py index 9a8ff00..5d6325e 100644 --- a/plugins/sieve.py +++ b/plugins/sieve.py @@ -1,3 +1,5 @@ +import re + from util import hook @@ -18,4 +20,9 @@ def sieve_suite(bot, input, func, kind, args): if input.chan.lower() in denied_channels: return None + fn = re.match(r'^plugins.(.+).py$', func._filename) + disabled = bot.config.get('disabled_plugins', {}) + if fn and fn.group(1).lower() in disabled: + return None + return input diff --git a/plugins/tag.py b/plugins/tag.py index 215f1a6..b473abb 100644 --- a/plugins/tag.py +++ b/plugins/tag.py @@ -70,7 +70,7 @@ def get_nicks_by_tag(db, chan, subject): " and chan=?" " order by lower(nick)", (subject, chan)).fetchall() - nicks = [munge(x[0], 3) for x in nicks] + nicks = [munge(x[0], 1) for x in nicks] if not nicks: return 'tag not found' return 'nicks tagged "%s": ' % subject + ', '.join(nicks)