Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-17 06:00:42 +01:00
Code Issues Projects Releases Wiki Activity

Use commands.wrap, removed a line of code whose purpose I don't know.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-12-03 08:52:12 +00:00
parent 3f9c699ea2
commit ac04024f47
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/Ctcp.py
View File

@ -40,10 +40,9 @@ import os
import sys import sys
import time import time
sys.path.append(os.pardir)
import supybot.conf as conf import supybot.conf as conf
import supybot.utils as utils import supybot.utils as utils
from supybot.commands import *
import supybot.ircmsgs as ircmsgs import supybot.ircmsgs as ircmsgs
import supybot.ircutils as ircutils import supybot.ircutils as ircutils
import supybot.privmsgs as privmsgs import supybot.privmsgs as privmsgs
@ -143,7 +142,7 @@ class Ctcp(callbacks.PrivmsgCommandAndRegexp):
if version == 'VERSION': if version == 'VERSION':
self.versions.setdefault(payload, []).append(msg.nick) self.versions.setdefault(payload, []).append(msg.nick)
def version(self, irc, msg, args): def version(self, irc, msg, args, channel, optlist):
"""[<channel>] [--nicks] """[<channel>] [--nicks]
Sends a CTCP VERSION to <channel>, returning the various Sends a CTCP VERSION to <channel>, returning the various
@ -154,10 +153,9 @@ class Ctcp(callbacks.PrivmsgCommandAndRegexp):
""" """
self.versions = ircutils.IrcDict() self.versions = ircutils.IrcDict()
nicks = False nicks = False
while '--nicks' in args: for (option, arg) in optlist:
nicks = True if option == 'nicks':
args.remove('--nicks') nicks = True
channel = privmsgs.getChannel(msg, args)
irc.queueMsg(ircmsgs.privmsg(channel, '\x01VERSION\x01')) irc.queueMsg(ircmsgs.privmsg(channel, '\x01VERSION\x01'))
def doReply(): def doReply():
if self.versions: if self.versions:
@ -174,6 +172,7 @@ class Ctcp(callbacks.PrivmsgCommandAndRegexp):
irc.reply('I received no version responses.') irc.reply('I received no version responses.')
wait = self.registryValue('versionWait') wait = self.registryValue('versionWait')
schedule.addEvent(doReply, time.time()+wait) schedule.addEvent(doReply, time.time()+wait)
version = wrap(version, ['channel', getopts({'nicks':''})])
Class = Ctcp Class = Ctcp
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: