mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-02-21 08:01:00 +01:00
Broke user and last commands off.
This commit is contained in:
parent
ef9c94beb5
commit
efc095fcc6
@ -110,43 +110,62 @@ class Seen(callbacks.Privmsg):
|
|||||||
pass # Not in the database.
|
pass # Not in the database.
|
||||||
|
|
||||||
def seen(self, irc, msg, args):
|
def seen(self, irc, msg, args):
|
||||||
"""[<channel>] [--user] [<name>]
|
"""[<channel>] <nick>
|
||||||
|
|
||||||
Returns the last time <name> was seen and what <name> was last seen
|
Returns the last time <nick> was seen and what <nick> was last seen
|
||||||
saying. --user will look for user <name> instead of using <name> as
|
saying. <channel> is only necessary if the message isn't sent on the
|
||||||
a nick (registered users, remember, can be recognized under any number
|
channel itself.
|
||||||
of nicks) <channel> is only necessary if the message isn't sent on the
|
|
||||||
channel itself. If <name> is not specified, the last person that was
|
|
||||||
seen and their message will be returned.
|
|
||||||
"""
|
"""
|
||||||
channel = privmsgs.getChannel(msg, args)
|
channel = privmsgs.getChannel(msg, args)
|
||||||
(optlist, rest) = getopt.getopt(args, '', ['user'])
|
name = privmsgs.getArgs(args)
|
||||||
name = privmsgs.getArgs(rest, required=0, optional=1)
|
try:
|
||||||
if name:
|
(when, said) = self.db.seen(channel, name)
|
||||||
nickOrId = name
|
irc.reply('%s was last seen here %s ago saying: %s' %
|
||||||
if ('--user', '') in optlist:
|
(name, utils.timeElapsed(time.time()-when), said))
|
||||||
try:
|
except KeyError:
|
||||||
nickOrId = ircdb.users.getUserId(name)
|
irc.reply('I have not seen %s.' % name)
|
||||||
except KeyError:
|
|
||||||
try:
|
def last(self, irc, msg, args):
|
||||||
hostmask = irc.state.nickToHostmask(name)
|
"""[<channel>]
|
||||||
nickOrId = ircdb.users.getUserId(hostmask)
|
|
||||||
except KeyError:
|
Returns the last thing said in <channel>. <channel> is only necessary
|
||||||
irc.errorNoUser()
|
if the message isn't sent in the channel itself.
|
||||||
return
|
"""
|
||||||
|
channel = privmsgs.getChannel(msg, args)
|
||||||
|
try:
|
||||||
|
(when, said) = self.db.seen(channel, '<last>')
|
||||||
|
irc.reply('Someone was last seen here %s ago saying: %s' %
|
||||||
|
(utils.timeElapsed(time.time()-when), said))
|
||||||
|
except KeyError:
|
||||||
|
irc.reply('I have never seen anyone.')
|
||||||
|
|
||||||
|
|
||||||
|
def user(self, irc, msg, args):
|
||||||
|
"""[<channel>] <name>
|
||||||
|
|
||||||
|
Returns the last time <name> was seen and what <name> was last seen
|
||||||
|
saying. This looks up <name> in the user seen database, which means
|
||||||
|
that it could be any nick recognized as user <name> that was seen.
|
||||||
|
<channel> is only necessary if the message isn't sent in the channel
|
||||||
|
itself.
|
||||||
|
"""
|
||||||
|
channel = privmsgs.getChannel(msg, args)
|
||||||
|
name = privmsgs.getArgs(args)
|
||||||
|
try:
|
||||||
|
id = ircdb.users.getUserId(name)
|
||||||
|
except KeyError:
|
||||||
try:
|
try:
|
||||||
(when, said) = self.db.seen(channel, nickOrId)
|
hostmask = irc.state.nickToHostmask(name)
|
||||||
irc.reply('%s was last seen here %s ago saying: %s' %
|
id = ircdb.users.getUserId(hostmask)
|
||||||
(name, utils.timeElapsed(time.time()-when), said))
|
|
||||||
except KeyError:
|
except KeyError:
|
||||||
irc.reply('I have not seen %s.' % name)
|
irc.errorNoUser()
|
||||||
else:
|
return
|
||||||
try:
|
try:
|
||||||
(when, said) = self.db.seen(channel, '<last>')
|
(when, said) = self.db.seen(channel, id)
|
||||||
irc.reply('Someone was last seen here %s ago saying: %s' %
|
irc.reply('%s was last seen here %s ago saying: %s' %
|
||||||
(utils.timeElapsed(time.time()-when), said))
|
(name, utils.timeElapsed(time.time()-when), said))
|
||||||
except KeyError:
|
except KeyError:
|
||||||
irc.reply('I have never seen anyone.')
|
irc.reply('I have not seen %s.' % name)
|
||||||
|
|
||||||
|
|
||||||
Class = Seen
|
Class = Seen
|
||||||
|
@ -51,16 +51,16 @@ class ChannelDBTestCase(ChannelPluginTestCase):
|
|||||||
self.assertNotRegexp('seen asldfkjasdlfkj', 'KeyError')
|
self.assertNotRegexp('seen asldfkjasdlfkj', 'KeyError')
|
||||||
|
|
||||||
def testSeen(self):
|
def testSeen(self):
|
||||||
self.assertNotError('seen')
|
self.assertNotError('seen last')
|
||||||
self.assertNotError('list')
|
self.assertNotError('list')
|
||||||
self.assertNotError('seen %s' % self.nick)
|
self.assertNotError('seen %s' % self.nick)
|
||||||
m = self.assertNotError('seen %s' % self.nick.upper())
|
m = self.assertNotError('seen %s' % self.nick.upper())
|
||||||
self.failUnless(self.nick.upper() in m.args[1])
|
self.failUnless(self.nick.upper() in m.args[1])
|
||||||
self.assertRegexp('seen --user %s' % self.nick,
|
self.assertRegexp('seen user %s' % self.nick,
|
||||||
'^%s was last seen' % self.nick)
|
'^%s was last seen' % self.nick)
|
||||||
|
|
||||||
def testSeenNoUser(self):
|
def testSeenNoUser(self):
|
||||||
self.assertNotRegexp('seen --user alsdkfjalsdfkj', 'KeyError')
|
self.assertNotRegexp('seen user alsdkfjalsdfkj', 'KeyError')
|
||||||
|
|
||||||
|
|
||||||
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
|
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user