From 59912776c1769d4d15cae4dd07133a9f7dfe1126 Mon Sep 17 00:00:00 2001 From: jesopo Date: Sun, 9 Sep 2018 17:09:04 +0100 Subject: Make commands be processed under received.message.* at PRIORITY_LOW, eat the event when it's done, change karma.py to use PRIORITY_MONITOR --- modules/karma.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/karma.py') diff --git a/modules/karma.py b/modules/karma.py index 5f6e5178..cb11e9ff 100644 --- a/modules/karma.py +++ b/modules/karma.py @@ -1,5 +1,5 @@ import re, time -import Utils +import EventManager, Utils REGEX_KARMA = re.compile("(.*)(\+{2,}|\-{2,})$") KARMA_DELAY_SECONDS = 3 @@ -10,7 +10,7 @@ class Module(object): self.events = events events.on("new").on("user").hook(self.new_user) events.on("received").on("message").on("channel").hook( - self.channel_message) + self.channel_message, priority=EventManager.PRIORITY_MONITOR) events.on("received").on("command").on("karma").hook( self.karma, help="Get your or someone else's karma", usage="[target]") -- cgit v1.3.1-10-gc9f91 From 4eaf9e5aeb63f164ff03482d1498604ccfb0d990 Mon Sep 17 00:00:00 2001 From: jesopo Date: Sun, 9 Sep 2018 17:34:44 +0100 Subject: Fix an incorrect call to event["stderr"] in karma.py --- modules/karma.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'modules/karma.py') diff --git a/modules/karma.py b/modules/karma.py index cb11e9ff..c7c3a263 100644 --- a/modules/karma.py +++ b/modules/karma.py @@ -52,10 +52,14 @@ class Module(object): event["user"].last_karma = time.time() elif verbose: if target: - self.events.on("send").on("stderr").call(module_name="Karma", - target=event["channel"], message="You cannot change your own karma") + self.events.on("send.stderr").call( + module_name="Karma", target=event["channel"], + message="You cannot change your own karma") elif verbose: - event["stderr"].write("Try again in a couple of seconds") + self.events.on("send.stderr").call(module_name="Karma", + target=event["channel"], + message="Try again in a couple of seconds") + def karma(self, event): if event["args"]: target = event["args"] -- cgit v1.3.1-10-gc9f91