Karma: refactor _doKarma handling

This commit is contained in:
GLolol 2015-01-12 18:08:44 -08:00
parent 40310c4d5a
commit 4729213898
1 changed files with 25 additions and 24 deletions

View File

@ -246,32 +246,33 @@ class Karma(callbacks.Plugin):
def _doKarma(self, irc, msg, channel, thing): def _doKarma(self, irc, msg, channel, thing):
inc = self.registryValue('incrementChars', channel) inc = self.registryValue('incrementChars', channel)
dec = self.registryValue('decrementChars', channel) dec = self.registryValue('decrementChars', channel)
if thing.endswith(tuple(inc + dec)): karma = ''
for s in inc: for s in inc:
if thing.endswith(s): if thing.endswith(s):
thing = thing[:-len(s)] thing = thing[:-len(s)]
# Don't reply if the target isn't a nick # Don't reply if the target isn't a nick
if thing.lower() not in map(ircutils.toLower, if thing.lower() not in map(ircutils.toLower,
irc.state.channels[channel].users): irc.state.channels[channel].users):
return return
if ircutils.strEqual(thing, msg.nick) and \ if ircutils.strEqual(thing, msg.nick) and \
not self.registryValue('allowSelfRating', channel): not self.registryValue('allowSelfRating', channel):
irc.error(_('You\'re not allowed to adjust your own karma.')) irc.error(_('You\'re not allowed to adjust your own karma.'))
return return
self.db.increment(channel, self._normalizeThing(thing)) self.db.increment(channel, self._normalizeThing(thing))
karma = self.db.get(channel, self._normalizeThing(thing)) karma = self.db.get(channel, self._normalizeThing(thing))
for s in dec: for s in dec:
if thing.endswith(s): if thing.endswith(s):
thing = thing[:-len(s)] thing = thing[:-len(s)]
if thing.lower() not in map(ircutils.toLower, if thing.lower() not in map(ircutils.toLower,
irc.state.channels[channel].users): irc.state.channels[channel].users):
return return
if ircutils.strEqual(thing, msg.nick) and \ if ircutils.strEqual(thing, msg.nick) and \
not self.registryValue('allowSelfRating', channel): not self.registryValue('allowSelfRating', channel):
irc.error(_('You\'re not allowed to adjust your own karma.')) irc.error(_('You\'re not allowed to adjust your own karma.'))
return return
self.db.decrement(channel, self._normalizeThing(thing)) self.db.decrement(channel, self._normalizeThing(thing))
karma = self.db.get(channel, self._normalizeThing(thing)) karma = self.db.get(channel, self._normalizeThing(thing))
if karma:
self._respond(irc, channel, thing, karma[0]-karma[1]) self._respond(irc, channel, thing, karma[0]-karma[1])
def invalidCommand(self, irc, msg, tokens): def invalidCommand(self, irc, msg, tokens):