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

added a timeout error and fixed the regex on karma.py.

Browse source
This commit is contained in:
jesopo 2016-04-21 00:09:30 +01:00
parent 0e37fca35a
commit 5e9574e195
No known key found for this signature in database
GPG key ID: 0BBDEB2AEFCFFCB3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/karma.py
View file

@ -1,7 +1,7 @@
import re, time import re, time
import Utils import Utils
REGEX_KARMA = re.compile("(.*)(\+{2,}|\-{2,})") REGEX_KARMA = re.compile("(.*)(\+{2,}|\-{2,})$")
KARMA_DELAY_SECONDS = 3 KARMA_DELAY_SECONDS = 3
class Module(object): class Module(object):
@ -25,12 +25,12 @@ class Module(object):
event["user"].last_karma = None event["user"].last_karma = None
def channel_message(self, event): def channel_message(self, event):
match = re.match(REGEX_KARMA, event["message"]) match = re.match(REGEX_KARMA, event["message"].strip())
if match: if match:
verbose = event["channel"].get_setting("karmaverbose", False)
if not event["user"].last_karma or (time.time()-event["user" if not event["user"].last_karma or (time.time()-event["user"
].last_karma) >= KARMA_DELAY_SECONDS: ].last_karma) >= KARMA_DELAY_SECONDS:
target = match.group(1).lower().strip() target = match.group(1).lower().strip()
verbose = event["channel"].get_setting("karmaverbose", False)
if not target == event["user"].name: if not target == event["user"].name:
positive = match.group(2)[0] == "+" positive = match.group(2)[0] == "+"
setting = "karma-%s" % target setting = "karma-%s" % target
@ -51,7 +51,8 @@ class Module(object):
elif verbose: elif verbose:
self.bot.events.on("send").on("stderr").call(module_name="Karma", self.bot.events.on("send").on("stderr").call(module_name="Karma",
target=event["channel"], message="You cannot change your own karma") target=event["channel"], message="You cannot change your own karma")
elif verbose:
event["stderr"].write("Try again in a couple of seconds")
def karma(self, event): def karma(self, event):
if event["args"]: if event["args"]:
target = event["args"] target = event["args"]