Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

split words/parens karma in to 2 regexes, only accept non-parens when ^$

Browse source 
closes #169
This commit is contained in:
jesopo 2019-10-03 13:20:03 +01:00
parent db4bb7db56
commit cee29ba1a5
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/karma.py
View file

@ -5,10 +5,10 @@
import re, time import re, time
from src import EventManager, ModuleManager, utils from src import EventManager, ModuleManager, utils
WORD_STOP = [",", ":"]
KARMA_DELAY_SECONDS = 3 KARMA_DELAY_SECONDS = 3
REGEX_KARMA = re.compile(r'(?:\(([^)]+)\)|(\S+))\s*(\+\+|--)(\s+|$)') REGEX_WORD = re.compile(r"^([^(\s]+)[:,]?\s*(\+\+|--)\s*$")
REGEX_PARENS = re.compile(r"\(([^)]+)\)\s*(\+\+|--)")
@utils.export("channelset", utils.BoolSetting("karma-pattern", @utils.export("channelset", utils.BoolSetting("karma-pattern",
"Enable/disable parsing ++/-- karma format")) "Enable/disable parsing ++/-- karma format"))
@ -73,26 +73,18 @@ class Module(ModuleManager.BaseModule):
else: else:
return False, "Try again in a couple of seconds" return False, "Try again in a couple of seconds"
@utils.hook("command.regex") @utils.hook("command.regex", pattern=REGEX_WORD)
@utils.hook("command.regex", pattern=REGEX_PARENS)
@utils.kwarg("command", "karma") @utils.kwarg("command", "karma")
@utils.kwarg("pattern", REGEX_KARMA) def regex_word(self, event):
def channel_message(self, event): if event["target"].get_setting("karma-pattern", False):
pattern = event["target"].get_setting("karma-pattern", False) target = event["match"].group(1)
if not pattern: positive = event["match"].group(2)=="++"
return
positive = event["match"].group(3) == "++" # if match group 3 is ++, add karma
# There are two possible match groups, an arbitrary length text inside (), or a single word followed by ++/--
# group 1 is the former, group 2 is the latter
target = event["match"].group(1) or event["match"].group(2)
target = target.strip().rstrip("".join(WORD_STOP)) # Strips "," " " or ":" from target
# if we have a target...
if target:
success, message = self._karma(event["server"], event["user"], success, message = self._karma(event["server"], event["user"],
target, positive) target, positive)
event["stdout" if success else "stderr"].write(message) event["stdout" if success else "stderr"].write(message)
@utils.hook("received.command.addpoint") @utils.hook("received.command.addpoint")
@utils.hook("received.command.rmpoint") @utils.hook("received.command.rmpoint")
@utils.kwarg("min_args", 1) @utils.kwarg("min_args", 1)