Skip to content
Browse files

ChannelLogger: check for logChannelMessages before logging.

  • Loading branch information...
1 parent 243cc0b commit fe540b36201ac144ef6645d79e2553826d80e033 @ProgVal committed Apr 26, 2013
Showing with 9 additions and 1 deletion.
  1. +9 −1 plugins/ChannelLogger/plugin.py
View
10 plugins/ChannelLogger/plugin.py
@@ -34,6 +34,7 @@
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 @@ def doPrivmsg(self, irc, msg):
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):

0 comments on commit fe540b3

Please sign in to comment.
Something went wrong with that request. Please try again.