PsychoticNinja/oddluck-limnoria-plugins
1
0
Fork 0
mirror of https://github.com/oddluck/limnoria-plugins.git synced 2025-05-06 19:43:51 -05:00
Code Issues Projects Releases Wiki Activity

Adds an optional channel parameter to the mergescores and mergetimes commands.

Browse Source 
Also, use more precise wraps (channel and nick instead of anything)
This commit is contained in:
Matthias Meusburger 2012-07-21 14:54:29 +02:00
parent 43be7c99c2
commit f016a3bc1b
1 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
plugin.py
View File

@ -236,20 +236,19 @@ class DuckHunt(callbacks.Plugin):
else: else:
irc.error('You have to be on a channel') irc.error('You have to be on a channel')
score = wrap(score, ['anything']) score = wrap(score, ['nick'])
# Merge scores # Merge scores
# nickto gets the points of nickfrom and nickfrom is removed from the scorelist # nickto gets the points of nickfrom and nickfrom is removed from the scorelist
def mergescores(self, irc, msg, args, nickto, nickfrom): def mergescores(self, irc, msg, args, channel, nickto, nickfrom):
"""<nickto> <nickfrom>: nickto gets the points of nickfrom and nickfrom is removed from the scorelist """ """[<channel>] <nickto> <nickfrom>: nickto gets the points of nickfrom and nickfrom is removed from the scorelist """
if self._capability(msg, 'owner'): if self._capability(msg, 'owner'):
currentChannel = msg.args[0] if irc.isChannel(channel):
if irc.isChannel(currentChannel):
try: try:
self._read_scores(currentChannel) self._read_scores(channel)
self.channelscores[currentChannel][nickto] += self.channelscores[currentChannel][nickfrom] self.channelscores[channel][nickto] += self.channelscores[channel][nickfrom]
del self.channelscores[currentChannel][nickfrom] del self.channelscores[channel][nickfrom]
self._write_scores(currentChannel) self._write_scores(channel)
#TODO: Reply with the config success message #TODO: Reply with the config success message
irc.reply("Okay!") irc.reply("Okay!")
@ -263,20 +262,20 @@ class DuckHunt(callbacks.Plugin):
else: else:
irc.error("Who are you again?") irc.error("Who are you again?")
mergescores = wrap(mergescores, ['anything', 'anything']) mergescores = wrap(mergescores, ['channel', 'nick', 'nick'])
# Merge times # Merge times
def mergetimes(self, irc, msg, args, nickto, nickfrom): def mergetimes(self, irc, msg, args, channel, nickto, nickfrom):
"""<nickto> <nickfrom>: nickto gets the best time of nickfrom if nickfrom time is better than nickto time, and nickfrom is removed from the timelist """ """[<channel>] <nickto> <nickfrom>: nickto gets the best time of nickfrom if nickfrom time is better than nickto time, and nickfrom is removed from the timelist """
if self._capability(msg, 'owner'): if self._capability(msg, 'owner'):
currentChannel = msg.args[0]
if irc.isChannel(currentChannel): if irc.isChannel(channel):
try: try:
self._read_scores(currentChannel) self._read_scores(channel)
if self.channeltimes[currentChannel][nickfrom] < self.channeltimes[currentChannel][nickto]: if self.channeltimes[channel][nickfrom] < self.channeltimes[channel][nickto]:
self.channeltimes[currentChannel][nickto] = self.channeltimes[currentChannel][nickfrom] self.channeltimes[channel][nickto] = self.channeltimes[channel][nickfrom]
del self.channeltimes[currentChannel][nickfrom] del self.channeltimes[channel][nickfrom]
self._write_scores(currentChannel) self._write_scores(channel)
irc.reply("Okay!") irc.reply("Okay!")
@ -290,7 +289,7 @@ class DuckHunt(callbacks.Plugin):
else: else:
irc.error("Who are you again?") irc.error("Who are you again?")
mergetimes = wrap(mergetimes, ['anything', 'anything']) mergetimes = wrap(mergetimes, ['channel', 'nick', 'nick'])
# Remove <nick>'s best time # Remove <nick>'s best time
@ -298,24 +297,19 @@ class DuckHunt(callbacks.Plugin):
"""[<channel>] <nick>: Remove <nick>'s best time """ """[<channel>] <nick>: Remove <nick>'s best time """
if self._capability(msg, 'owner'): if self._capability(msg, 'owner'):
if (not channel):
channel = msg.args[0]
if irc.isChannel(channel): if irc.isChannel(channel):
self._read_scores(channel) self._read_scores(channel)
del self.channeltimes[channel][nick] del self.channeltimes[channel][nick]
self._write_scores(channel) self._write_scores(channel)
irc.reply("Okay!") irc.reply("Okay!")
else: else:
irc.error('Are you sure ' + str(channel) + ' is a channel?') irc.error('Are you sure ' + str(channel) + ' is a channel?')
else: else:
irc.error("Who are you again?") irc.error("Who are you again?")
rmtime = wrap(rmtime, [optional('anything'), 'anything']) rmtime = wrap(rmtime, ['channel', 'nick'])
# Remove <nick>'s best score # Remove <nick>'s best score
@ -323,9 +317,6 @@ class DuckHunt(callbacks.Plugin):
"""[<channel>] <nick>: Remove <nick>'s score """ """[<channel>] <nick>: Remove <nick>'s score """
if self._capability(msg, 'owner'): if self._capability(msg, 'owner'):
if (not channel):
channel = msg.args[0]
if irc.isChannel(channel): if irc.isChannel(channel):
try: try:
self._read_scores(channel) self._read_scores(channel)
@ -336,14 +327,13 @@ class DuckHunt(callbacks.Plugin):
except: except:
irc.error("Something went wrong") irc.error("Something went wrong")
else: else:
irc.error('Are you sure this is a channel?') irc.error('Are you sure this is a channel?')
else: else:
irc.error("Who are you again?") irc.error("Who are you again?")
rmscore = wrap(rmscore, [optional('anything'), 'anything']) rmscore = wrap(rmscore, ['channel', 'nick'])
@ -351,8 +341,6 @@ class DuckHunt(callbacks.Plugin):
# Shows all scores for the channel # Shows all scores for the channel
def listscores(self, irc, msg, args, channel): def listscores(self, irc, msg, args, channel):
"""[<channel>]: Shows the score list for <channel> (or for the current channel if no channel is given)""" """[<channel>]: Shows the score list for <channel> (or for the current channel if no channel is given)"""
if (not channel):
channel = msg.args[0]
if irc.isChannel(channel): if irc.isChannel(channel):
try: try:
@ -377,16 +365,13 @@ class DuckHunt(callbacks.Plugin):
irc.reply("There aren't any scores for this channel yet.") irc.reply("There aren't any scores for this channel yet.")
else: else:
irc.reply("Are you sure this is a channel?") irc.reply("Are you sure this is a channel?")
listscores = wrap(listscores, [optional('anything')]) listscores = wrap(listscores, ['channel'])
# Shows all times for the channel # Shows all times for the channel
def listtimes(self, irc, msg, args, channel): def listtimes(self, irc, msg, args, channel):
"""[<channel>]: Shows the time list for <channel> (or for the current channel if no channel is given)""" """[<channel>]: Shows the time list for <channel> (or for the current channel if no channel is given)"""
if (not channel):
channel = msg.args[0]
if irc.isChannel(channel): if irc.isChannel(channel):
self._read_scores(channel) self._read_scores(channel)
@ -410,7 +395,7 @@ class DuckHunt(callbacks.Plugin):
irc.reply("There aren't any times for this channel yet.") irc.reply("There aren't any times for this channel yet.")
else: else:
irc.reply("Are you sure this is a channel?") irc.reply("Are you sure this is a channel?")
listtimes = wrap(listtimes, [optional('anything')]) listtimes = wrap(listtimes, ['channel'])
# This is the callback when someones speaks in the channel # This is the callback when someones speaks in the channel