Karma: add support configurable chars (picks up where #596 left off)

This commit is contained in:
James Lu 2014-10-12 12:56:43 -07:00
parent d2046a81a2
commit 42a858595b
5 changed files with 31 additions and 29 deletions

View File

@ -45,6 +45,12 @@ Karma = conf.registerPlugin('Karma')
conf.registerChannelValue(Karma, 'simpleOutput',
registry.Boolean(False, _("""Determines whether the bot will output shorter
versions of the karma output when requesting a single thing's karma.""")))
conf.registerChannelValue(Karma, 'incrementChars',
registry.SpaceSeparatedListOfStrings(['++'], _("""A space separated list of
characters to increase karma.""")))
conf.registerChannelValue(Karma, 'decrementChars',
registry.SpaceSeparatedListOfStrings(['--'], _("""A space separated list of
characters to decrease karma.""")))
conf.registerChannelValue(Karma, 'response',
registry.Boolean(False, _("""Determines whether the bot will reply with a
success message when something's karma is increased or decreased.""")))

View File

@ -67,7 +67,7 @@ msgstr ""
msgid "%(thing)s's karma is now %(karma)i"
msgstr "%(thing)in karma on nyt %(karma)i"
#: plugin.py:248 plugin.py:257
#: plugin.py:251
msgid "You're not allowed to adjust your own karma."
msgstr "Sinä et saa määrittää omaa karmaasi."

View File

@ -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:245 plugin.py:254
#: plugin.py:251
msgid "You're not allowed to adjust your own karma."
msgstr "Vous n'êtes pas autorisé à modifier votre propre karma."

View File

@ -55,7 +55,7 @@ msgid ""
msgstr ""
"Determina se il bot aumenterà o diminuirà il karma senza essere richiamato."
#: plugin.py:247 plugin.py:255
#: plugin.py:251
msgid "You're not allowed to adjust your own karma."
msgstr "Non ti è permesso di modificare il tuo karma."

View File

@ -242,34 +242,31 @@ class Karma(callbacks.Plugin):
else:
irc.noReply()
def _doKarma(self, irc, channel, thing):
assert thing[-2:] in ('++', '--')
if thing.endswith('++'):
thing = thing[:-2]
if ircutils.strEqual(thing, irc.msg.nick) and \
not self.registryValue('allowSelfRating', channel):
irc.error(_('You\'re not allowed to adjust your own karma.'))
elif thing:
self.db.increment(channel, self._normalizeThing(thing))
karma = self.db.get(channel, self._normalizeThing(thing))
self._respond(irc, channel, thing, karma[0]-karma[1])
else:
thing = thing[:-2]
if ircutils.strEqual(thing, irc.msg.nick) and \
not self.registryValue('allowSelfRating', channel):
irc.error(_('You\'re not allowed to adjust your own karma.'))
elif thing:
self.db.decrement(channel, self._normalizeThing(thing))
karma = self.db.get(channel, self._normalizeThing(thing))
self._respond(irc, channel, thing, karma[0]-karma[1])
def _doKarma(self, irc, msg, channel, thing):
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)]
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)]
self.db.decrement(channel, self._normalizeThing(thing))
karma = self.db.get(channel, self._normalizeThing(thing))
self._respond(irc, channel, thing, karma[0]-karma[1])
def invalidCommand(self, irc, msg, tokens):
channel = msg.args[0]
if not irc.isChannel(channel) or not tokens:
return
if tokens[-1][-2:] in ('++', '--'):
if irc.isChannel(channel) and tokens:
thing = ' '.join(tokens)
self._doKarma(irc, channel, thing)
self._doKarma(irc, msg, channel, thing)
def doPrivmsg(self, irc, msg):
# We don't handle this if we've been addressed because invalidCommand
@ -282,8 +279,7 @@ class Karma(callbacks.Plugin):
self.registryValue('allowUnaddressedKarma', channel):
irc = callbacks.SimpleProxy(irc, msg)
thing = msg.args[1].rstrip()
if thing[-2:] in ('++', '--'):
self._doKarma(irc, channel, thing)
self._doKarma(irc, msg, channel, thing)
@internationalizeDocstring
def karma(self, irc, msg, args, channel, things):