mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-23 02:49:27 +01:00
RFE 1017095 - Added wildcard support to Seen command
This commit is contained in:
parent
fb56c08278
commit
f3d0670175
@ -31,7 +31,12 @@
|
||||
Keeps track of the last time a user was seen on a channel.
|
||||
"""
|
||||
|
||||
import supybot
|
||||
|
||||
__revision__ = "$Id$"
|
||||
__contributors__ = {
|
||||
supybot.authors.skorobeus: ['wildcard support'],
|
||||
}
|
||||
|
||||
import os
|
||||
import re
|
||||
@ -73,6 +78,25 @@ class SeenDB(plugins.ChannelUserDB):
|
||||
seen = time.time()
|
||||
self[channel, nickOrId] = (seen, saying)
|
||||
self[channel, '<last>'] = (seen, saying)
|
||||
|
||||
def seenWildcard(self, channel, nick):
|
||||
nicks = []
|
||||
nickRe = re.compile('.*'.join(nick.split('*')), re.I)
|
||||
for (searchChan, searchNick) in self.keys():
|
||||
#print 'chan: %s ... nick: %s' % (searchChan, searchNick)
|
||||
if isinstance(searchNick, int):
|
||||
# We need to skip the reponses that are keyed by id as they
|
||||
# apparently duplicate the responses for the same person that
|
||||
# are keyed by nick-string
|
||||
continue
|
||||
if ircutils.strEqual(searchChan, channel):
|
||||
try:
|
||||
s = nickRe.match(searchNick).group()
|
||||
except AttributeError:
|
||||
continue
|
||||
nicks.append(s)
|
||||
L = [[nick, self.seen(channel, nick)] for nick in nicks]
|
||||
return L
|
||||
|
||||
def seen(self, channel, nickOrId):
|
||||
return self[channel, nickOrId]
|
||||
@ -116,9 +140,26 @@ class Seen(callbacks.Privmsg):
|
||||
channel = privmsgs.getChannel(msg, args)
|
||||
name = privmsgs.getArgs(args)
|
||||
try:
|
||||
(when, said) = self.db.seen(channel, name)
|
||||
irc.reply('%s was last seen here %s ago saying: %s' %
|
||||
(name, utils.timeElapsed(time.time()-when), said))
|
||||
results = []
|
||||
if '*' in name:
|
||||
results = self.db.seenWildcard(channel, name)
|
||||
else:
|
||||
results = [[name, self.db.seen(channel, name)]]
|
||||
if len(results) == 1:
|
||||
(nick, info) = results[0]
|
||||
(when, said) = info
|
||||
irc.reply('%s was last seen here %s ago saying: %s' %
|
||||
(nick, utils.timeElapsed(time.time()-when), said))
|
||||
elif len(results) > 1:
|
||||
L = []
|
||||
for (nick, info) in results:
|
||||
(when, said) = info
|
||||
L.append('%s (%s ago)' %
|
||||
(nick, utils.timeElapsed(time.time()-when)))
|
||||
irc.reply('%s could be %s' % (name, utils.commaAndify(L, And='or')))
|
||||
else:
|
||||
irc.reply('I haven\'t seen anyone matching %s' % name)
|
||||
|
||||
except KeyError:
|
||||
irc.reply('I have not seen %s.' % name)
|
||||
|
||||
|
@ -37,6 +37,7 @@ class ChannelDBTestCase(ChannelPluginTestCase):
|
||||
ChannelPluginTestCase.setUp(self)
|
||||
self.prefix = 'foo!bar@baz'
|
||||
self.nick = 'foo'
|
||||
self.wildcardTest = ['f*', '*oo', '*foo*', 'f*o*o']
|
||||
self.irc.feedMsg(ircmsgs.privmsg(self.irc.nick,
|
||||
'register foo bar',
|
||||
prefix=self.prefix))
|
||||
@ -56,6 +57,10 @@ class ChannelDBTestCase(ChannelPluginTestCase):
|
||||
self.failUnless(self.nick.upper() in m.args[1])
|
||||
self.assertRegexp('seen user %s' % self.nick,
|
||||
'^%s was last seen' % self.nick)
|
||||
for wildcard in self.wildcardTest:
|
||||
self.assertRegexp('seen %s' % wildcard,
|
||||
'^%s was last seen' % self.nick)
|
||||
self.assertRegexp('seen bar*', '^I haven\'t seen anyone matching')
|
||||
|
||||
def testSeenNoUser(self):
|
||||
self.assertNotRegexp('seen user alsdkfjalsdfkj', 'KeyError')
|
||||
|
Loading…
Reference in New Issue
Block a user