diff options
Diffstat (limited to 'modules/karma.py')
| -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 f728e7e1..194bd424 100644 --- a/modules/karma.py +++ b/modules/karma.py @@ -7,7 +7,7 @@ from src import EventManager, ModuleManager, utils KARMA_DELAY_SECONDS = 3 -REGEX_WORD = re.compile(r"^([^(\s,:]+)(?:[:,]\s*)?(\+\+|--)\s*$") +REGEX_WORD = re.compile(r"^([^(\s,:]+)(?:[:,])?\s*(\+\+|--)\s*$") REGEX_WORD_START = re.compile(r"^(\+\+|--)(?:\s*)([^(\s,:]+)\s*$") REGEX_PARENS = re.compile(r"\(([^)]+)\)(\+\+|--)") @@ -68,8 +68,8 @@ class Module(ModuleManager.BaseModule): karma_total = self._karma_str(self._get_karma(server, target)) - return True, "%s has given %s %s karma (%s total)" % ( - sender.nickname, target, karma_str, karma_total) + return True, "%s now has %s karma (%s from %s)" % ( + target, karma_total, karma_str, sender.nickname) @utils.hook("command.regex", pattern=REGEX_WORD) @utils.hook("command.regex", pattern=REGEX_PARENS) |