karma: ignore commands or chatter separately
This commit is contained in:
parent
bf0445149b
commit
4abcef58c1
|
@ -159,7 +159,8 @@ IRCBOT_XMLRPC_PORT = 13132
|
||||||
|
|
||||||
# karma
|
# karma
|
||||||
|
|
||||||
KARMA_IGNORED_CHATTER_TARGETS = []
|
KARMA_IGNORE_CHATTER_TARGETS = []
|
||||||
|
KARMA_IGNORE_COMMAND_TARGETS = []
|
||||||
|
|
||||||
# storycraft
|
# storycraft
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ class Karma(Plugin):
|
||||||
karma_pattern = r'(?:\((.+?)\)|(\S+))(\+\+|--|\+-|-\+)(\s+|$)'
|
karma_pattern = r'(?:\((.+?)\)|(\S+))(\+\+|--|\+-|-\+)(\s+|$)'
|
||||||
|
|
||||||
where = event.target
|
where = event.target
|
||||||
if where in settings.KARMA_IGNORED_CHATTER_TARGETS:
|
if where in settings.KARMA_IGNORE_CHATTER_TARGETS:
|
||||||
log.debug("ignoring chatter in {0:s}".format(where))
|
log.debug("ignoring chatter in {0:s}".format(where))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -85,6 +85,11 @@ class Karma(Plugin):
|
||||||
def handle_rank(self, connection, event, match):
|
def handle_rank(self, connection, event, match):
|
||||||
"""Report on the rank of a karma item."""
|
"""Report on the rank of a karma item."""
|
||||||
|
|
||||||
|
where = event.target
|
||||||
|
if where in settings.KARMA_IGNORE_COMMAND_TARGETS:
|
||||||
|
log.debug("ignoring command in {0:s}".format(where))
|
||||||
|
return
|
||||||
|
|
||||||
key = match.group(1).lower().rstrip()
|
key = match.group(1).lower().rstrip()
|
||||||
try:
|
try:
|
||||||
karma_key = KarmaKey.objects.get(key=key)
|
karma_key = KarmaKey.objects.get(key=key)
|
||||||
|
@ -97,6 +102,11 @@ class Karma(Plugin):
|
||||||
def handle_report(self, connection, event, match):
|
def handle_report(self, connection, event, match):
|
||||||
"""Provide some karma reports."""
|
"""Provide some karma reports."""
|
||||||
|
|
||||||
|
where = event.target
|
||||||
|
if where in settings.KARMA_IGNORE_COMMAND_TARGETS:
|
||||||
|
log.debug("ignoring command in {0:s}".format(where))
|
||||||
|
return
|
||||||
|
|
||||||
report = match.group(1).lower()
|
report = match.group(1).lower()
|
||||||
if report == 'highest':
|
if report == 'highest':
|
||||||
sorted_keys = KarmaKey.objects.ranked_scored_order()
|
sorted_keys = KarmaKey.objects.ranked_scored_order()
|
||||||
|
@ -128,6 +138,11 @@ class Karma(Plugin):
|
||||||
def handle_stats(self, connection, event, match):
|
def handle_stats(self, connection, event, match):
|
||||||
"""Provide stats on a karma user."""
|
"""Provide stats on a karma user."""
|
||||||
|
|
||||||
|
where = event.target
|
||||||
|
if where in settings.KARMA_IGNORE_COMMAND_TARGETS:
|
||||||
|
log.debug("ignoring command in {0:s}".format(where))
|
||||||
|
return
|
||||||
|
|
||||||
karmaer = match.group(1)
|
karmaer = match.group(1)
|
||||||
log_entries = KarmaLogEntry.objects.filter(nickmask=karmaer)
|
log_entries = KarmaLogEntry.objects.filter(nickmask=karmaer)
|
||||||
if len(log_entries) == 0:
|
if len(log_entries) == 0:
|
||||||
|
|
Loading…
Reference in New Issue