From fe540b36201ac144ef6645d79e2553826d80e033 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@progval.net>
Date: Fri, 26 Apr 2013 17:52:18 +0200
Subject: [PATCH] ChannelLogger: check for logChannelMessages before logging.

---
 plugins/ChannelLogger/plugin.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/ChannelLogger/plugin.py b/plugins/ChannelLogger/plugin.py
index 6ee690456..0abbd05e4 100644
--- a/plugins/ChannelLogger/plugin.py
+++ b/plugins/ChannelLogger/plugin.py
@@ -34,6 +34,7 @@ from cStringIO import StringIO
 
 import supybot.conf as conf
 import supybot.world as world
+import supybot.ircdb as ircdb
 import supybot.irclib as irclib
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
@@ -183,7 +184,14 @@ class ChannelLogger(callbacks.Plugin):
         for channel in recipients.split(','):
             if irc.isChannel(channel):
                 noLogPrefix = self.registryValue('noLogPrefix', channel)
-                if noLogPrefix and text.startswith(noLogPrefix):
+                cap = ircdb.makeChannelCapability(channel, 'logChannelMessages')
+                try:
+                    logChannelMessages = ircdb.checkCapability(msg.prefix, cap,
+                        ignoreOwner=True)
+                except KeyError:
+                    logChannelMessages = True
+                if (noLogPrefix and text.startswith(noLogPrefix)) or \
+                        not logChannelMessages:
                     text = '-= THIS MESSAGE NOT LOGGED =-'
                 nick = msg.nick or irc.nick
                 if ircmsgs.isAction(msg):