normalise target names between ++/-- and !karma
This commit is contained in:
parent
ed7150a8b7
commit
59289b3742
1 changed files with 8 additions and 5 deletions
|
@ -41,14 +41,17 @@ class Module(ModuleManager.BaseModule):
|
||||||
else:
|
else:
|
||||||
user._last_negative_karma = time.time()
|
user._last_negative_karma = time.time()
|
||||||
|
|
||||||
|
def _get_target(self, server, target):
|
||||||
|
target = target.strip()
|
||||||
|
if not " " in target and server.has_user(target):
|
||||||
|
return server.get_user_nickname(server.get_user(target).get_id())
|
||||||
|
return target.lower()
|
||||||
|
|
||||||
def _change_karma(self, server, sender, target, positive):
|
def _change_karma(self, server, sender, target, positive):
|
||||||
if not self._check_throttle(sender, positive):
|
if not self._check_throttle(sender, positive):
|
||||||
return False, "Try again in a couple of seconds"
|
return False, "Try again in a couple of seconds"
|
||||||
|
|
||||||
if " " in target and server.has_user(target):
|
target = self._get_target()
|
||||||
target = server.get_user_nickname(target.get_id())
|
|
||||||
else:
|
|
||||||
target = target.lower()
|
|
||||||
|
|
||||||
setting = "karma-%s" % target
|
setting = "karma-%s" % target
|
||||||
karma = sender.get_setting(setting, 0)
|
karma = sender.get_setting(setting, 0)
|
||||||
|
@ -95,7 +98,7 @@ class Module(ModuleManager.BaseModule):
|
||||||
target = event["args"]
|
target = event["args"]
|
||||||
else:
|
else:
|
||||||
target = event["user"].nickname
|
target = event["user"].nickname
|
||||||
target = target.strip()
|
target = self._get_target(event["server"], target)
|
||||||
|
|
||||||
settings = dict(
|
settings = dict(
|
||||||
event["server"].get_all_user_settings("karma-%s" % target))
|
event["server"].get_all_user_settings("karma-%s" % target))
|
||||||
|
|
Loading…
Reference in a new issue