diff options
| author |  Noah Pederson | 2019-09-27 07:32:09 -0600 |
|---|---|---|
| committer | Noah Pederson | 2019-09-27 07:32:09 -0600 |
| commit | c3f95130a38017a4a3e4fa568be8209026b1286a (patch) | |
| tree | f1aa53b218b1e5644b424d205ef690f0aa9727e0 /modules | |
| parent | Improves sentence processing for karma (diff) | |
| signature | ||
Some minor cleanup
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/karma.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/karma.py b/modules/karma.py index 528613cf..bcb07db6 100644 --- a/modules/karma.py +++ b/modules/karma.py @@ -8,7 +8,7 @@ from src import EventManager, ModuleManager, utils WORD_STOP = [",", ":"] KARMA_DELAY_SECONDS = 3 -REGEX_KARMA = re.compile(r'(?:\((.+?)\)|(\S+))(\+\+|--)(\s+|$)') +REGEX_KARMA = re.compile(r'(?:\(([^)]+)\)|(\S+))(\+\+|--)(\s+|$)') @utils.export("channelset", utils.BoolSetting("karma-pattern", "Enable/disable parsing ++/-- karma format")) @@ -84,9 +84,9 @@ class Module(ModuleManager.BaseModule): # 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) if event["match"].group(1) else event["match"].group(2) + 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"], |