Merge branch 'develop'
This commit is contained in:
commit
3749f1d121
|
@ -12,7 +12,7 @@ def banish(self, name, source, response):
|
|||
self.bot.memories["users"][user] = dict()
|
||||
|
||||
self.bot.memories["users"][user]["blacklist"] = {
|
||||
"reason": reason,
|
||||
"reason": reason.strip(),
|
||||
"when": datetime.now().timestamp()
|
||||
}
|
||||
|
||||
|
@ -24,7 +24,7 @@ def banish(self, name, source, response):
|
|||
def pardon(self, name, source, response):
|
||||
botnick = self.bot.botnick
|
||||
author = self.bot.author
|
||||
user = response.split("!pardon ")[1]
|
||||
user = response.split("!pardon ")[1].strip()
|
||||
|
||||
if name != author:
|
||||
return
|
||||
|
|
|
@ -24,7 +24,7 @@ def hmmscore(self, name, source, response):
|
|||
score_format = "Hmm score for '{}': {}"
|
||||
|
||||
if " " in response:
|
||||
name = response.split(" ", 1)[1]
|
||||
name = response.split(" ", 1)[1].strip()
|
||||
|
||||
if name not in self.bot.memories["users"]:
|
||||
self.bot.send_message(source, score_format.format(name, score))
|
||||
|
|
|
@ -48,7 +48,7 @@ class Responses:
|
|||
if name not in users:
|
||||
return False
|
||||
|
||||
response = response.lower()
|
||||
response = response.lower().strip()
|
||||
check = {
|
||||
"name": name,
|
||||
"source": source,
|
||||
|
|
Loading…
Reference in New Issue