From 41fb0f8eca3e0b1e6f44210744f5a639e8502449 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sun, 12 Oct 2014 13:22:56 -0700 Subject: [PATCH] Karma: fix allowSelfRating --- plugins/Karma/locales/fi.po | 2 +- plugins/Karma/locales/fr.po | 2 +- plugins/Karma/locales/it.po | 2 +- plugins/Karma/plugin.py | 12 ++++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/Karma/locales/fi.po b/plugins/Karma/locales/fi.po index a5f7c1eea..4b2e02588 100644 --- a/plugins/Karma/locales/fi.po +++ b/plugins/Karma/locales/fi.po @@ -67,7 +67,7 @@ msgstr "" msgid "%(thing)s's karma is now %(karma)i" msgstr "%(thing)in karma on nyt %(karma)i" -#: plugin.py:251 +#: plugin.py:254 plugin.py:263 msgid "You're not allowed to adjust your own karma." msgstr "Sinä et saa määrittää omaa karmaasi." diff --git a/plugins/Karma/locales/fr.po b/plugins/Karma/locales/fr.po index a9d37fc36..1f87ec5d5 100644 --- a/plugins/Karma/locales/fr.po +++ b/plugins/Karma/locales/fr.po @@ -62,7 +62,7 @@ msgstr "" msgid "%(thing)s's karma is now %(karma)i" msgstr "Le karma de %(thing)s est maintenant %(karma)i" -#: plugin.py:251 +#: plugin.py:254 plugin.py:263 msgid "You're not allowed to adjust your own karma." msgstr "Vous n'êtes pas autorisé à modifier votre propre karma." diff --git a/plugins/Karma/locales/it.po b/plugins/Karma/locales/it.po index 1509b5992..0ff5f1ba7 100644 --- a/plugins/Karma/locales/it.po +++ b/plugins/Karma/locales/it.po @@ -55,7 +55,7 @@ msgid "" msgstr "" "Determina se il bot aumenterà o diminuirà il karma senza essere richiamato." -#: plugin.py:251 +#: plugin.py:254 plugin.py:263 msgid "You're not allowed to adjust your own karma." msgstr "Non ti è permesso di modificare il tuo karma." diff --git a/plugins/Karma/plugin.py b/plugins/Karma/plugin.py index 901b20efb..70f2cdc94 100644 --- a/plugins/Karma/plugin.py +++ b/plugins/Karma/plugin.py @@ -246,18 +246,22 @@ class Karma(callbacks.Plugin): inc = self.registryValue('incrementChars', channel) dec = self.registryValue('decrementChars', channel) if thing.endswith(tuple(inc + dec)): - if ircutils.strEqual(thing, msg.nick) and \ - not self.registryValue('allowSelfRating', channel): - irc.error(_('You\'re not allowed to adjust your own karma.'), - Raise=True) for s in inc: if thing.endswith(s): thing = thing[:-len(s)] + if ircutils.strEqual(thing, msg.nick) and \ + not self.registryValue('allowSelfRating', channel): + irc.error(_('You\'re not allowed to adjust your own karma.')) + return self.db.increment(channel, self._normalizeThing(thing)) karma = self.db.get(channel, self._normalizeThing(thing)) for s in dec: if thing.endswith(s): thing = thing[:-len(s)] + if ircutils.strEqual(thing, msg.nick) and \ + not self.registryValue('allowSelfRating', channel): + irc.error(_('You\'re not allowed to adjust your own karma.')) + return self.db.decrement(channel, self._normalizeThing(thing)) karma = self.db.get(channel, self._normalizeThing(thing)) self._respond(irc, channel, thing, karma[0]-karma[1])