Added an optional argument for the notes command.

This commit is contained in:
Jeremy Fincher 2004-11-26 08:11:19 +00:00
parent 08040bf106
commit 6adc746696

View File

@ -69,6 +69,10 @@ conf.registerGlobalValue(conf.supybot.plugins.Later, 'private',
first place in which they're seen, or in private.""")) first place in which they're seen, or in private."""))
class Later(callbacks.Privmsg): class Later(callbacks.Privmsg):
"""Used to do things later; currently, it only allows the sending of
nick-based notes. Do note (haha!) that these notes are *not* private
and don't even pretend to be; if you want such features, consider using the
Note plugin."""
def __init__(self): def __init__(self):
callbacks.Privmsg.__init__(self) callbacks.Privmsg.__init__(self)
self._notes = ircutils.IrcDict() self._notes = ircutils.IrcDict()
@ -140,16 +144,25 @@ class Later(callbacks.Privmsg):
irc.error('That person\'s message queue is already full.') irc.error('That person\'s message queue is already full.')
tell = wrap(tell, ['nick', 'text']) tell = wrap(tell, ['nick', 'text'])
def notes(self, irc, msg, args): def notes(self, irc, msg, args, nick):
"""takes no arguments """[<nick>]
Tells which nicks have notes waiting for them. If <nick> is given, replies with what notes are waiting on <nick>,
otherwise, replies with the nicks that have notes waiting for them.
""" """
if nick:
if nick in self._notes:
notes = [self._formatNote(when, whence, note)
for (when, whence, note) in self._notes[nick]]
irc.reply(utils.commaAndify(notes))
else:
irc.error('I have no notes for that nick.')
else:
nicks = self._notes.keys() nicks = self._notes.keys()
utils.sortBy(ircutils.toLower, nicks) utils.sortBy(ircutils.toLower, nicks)
irc.reply('I currently have notes waiting for %s.' % irc.reply('I currently have notes waiting for %s.' %
utils.commaAndify(nicks)) utils.commaAndify(nicks))
#notes = wrap(notes) notes = wrap(notes, [additional('something')])
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
notes = self._notes.pop(msg.nick, []) notes = self._notes.pop(msg.nick, [])
@ -165,10 +178,13 @@ class Later(callbacks.Privmsg):
irc = callbacks.SimpleProxy(irc, msg) irc = callbacks.SimpleProxy(irc, msg)
private = self.registryValue('private') private = self.registryValue('private')
for (when, whence, note) in notes: for (when, whence, note) in notes:
s = 'Sent %s: <%s> %s' % (self._timestamp(when), whence, note) s = self._formatNote(when, whence, note)
irc.reply(s, private=private) irc.reply(s, private=private)
self._flushNotes() self._flushNotes()
def _formatNote(self, when, whence, note):
return 'Sent %s: <%s> %s' % (self._timestamp(when), whence, note)
Class = Later Class = Later