mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-27 13:19:24 +01:00
Overhauled 'wordstats' to handle a plethora of argument combinations and wrote
some naaaaaaaaasty tests to make sure they work as expected.
This commit is contained in:
Daniel DiPaolo
parent
f051166e60
commit
adc9e0552d
@ -462,39 +462,101 @@ class ChannelDB(callbacks.Privmsg,plugins.Toggleable,plugins.ChannelDBHandler):
|
|||||||
irc.reply(msg, conf.replySuccess)
|
irc.reply(msg, conf.replySuccess)
|
||||||
|
|
||||||
def wordstats(self, irc, msg, args):
|
def wordstats(self, irc, msg, args):
|
||||||
"""[<channel>] <user> <word>
|
"""[<channel>] [<user>] [<word>]
|
||||||
|
|
||||||
Gets the stats kept on <user> for the number of times he's used <word>.
|
With no arguments, returns the list of words that are being monitored
|
||||||
|
for stats. With <user> alone, returns all the stats for that user.
|
||||||
|
With <word> alone, returns the top users for that word. With <user>
|
||||||
|
and <word>, returns that user's stat for that word. <channel> is only
|
||||||
|
needed if not said in the channel.
|
||||||
"""
|
"""
|
||||||
channel = privmsgs.getChannel(msg, args)
|
channel = privmsgs.getChannel(msg, args)
|
||||||
(user, word) = privmsgs.getArgs(args, needed=2)
|
(arg1, arg2) = privmsgs.getArgs(args, needed=0, optional=2)
|
||||||
try:
|
|
||||||
id = ircdb.users.getUserId(user)
|
|
||||||
except KeyError: # Maybe it was a nick. We'll look up by hostmask.
|
|
||||||
try:
|
|
||||||
hostmask = irc.state.nickToHostmask(user)
|
|
||||||
id = ircdb.users.getUserId(hostmask)
|
|
||||||
except KeyError:
|
|
||||||
irc.error(msg, conf.replyNoUser)
|
|
||||||
return
|
|
||||||
db = self.getDb(channel)
|
db = self.getDb(channel)
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
word = word.lower()
|
if not arg1 and not arg2:
|
||||||
cursor.execute("""SELECT word_stats.count FROM words, word_stats
|
cursor.execute("""SELECT word FROM words""")
|
||||||
WHERE words.word=%s AND
|
|
||||||
word_id=words.id AND
|
|
||||||
word_stats.user_id=%s""", word, id)
|
|
||||||
if cursor.rowcount == 0:
|
|
||||||
cursor.execute("""SELECT id FROM words WHERE word=%s""", word)
|
|
||||||
if cursor.rowcount == 0:
|
if cursor.rowcount == 0:
|
||||||
irc.error(msg, 'I\'m not keeping stats on %r.' % word)
|
irc.reply(msg, 'I am not currently keeping any word stats.')
|
||||||
else:
|
return
|
||||||
irc.error(msg, '%s has never said %r.' % (user, word))
|
l = [repr(tup[0]) for tup in cursor.fetchall()]
|
||||||
return
|
s = 'Currently keeping stats for: %s' % utils.commaAndify(l)
|
||||||
count = int(cursor.fetchone()[0])
|
irc.reply(msg, s)
|
||||||
s = '%s has said %r %s.' % (user, word, utils.nItems(count, 'time'))
|
elif arg1 and arg2:
|
||||||
irc.reply(msg, s)
|
user, word = (arg1, arg2)
|
||||||
|
try:
|
||||||
|
id = ircdb.users.getUserId(user)
|
||||||
|
except KeyError: # Maybe it was a nick. Check the hostmask.
|
||||||
|
try:
|
||||||
|
hostmask = irc.state.nickToHostmask(user)
|
||||||
|
id = ircdb.users.getUserId(hostmask)
|
||||||
|
except KeyError:
|
||||||
|
irc.error(msg, conf.replyNoUser)
|
||||||
|
return
|
||||||
|
db = self.getDb(channel)
|
||||||
|
cursor = db.cursor()
|
||||||
|
word = word.lower()
|
||||||
|
cursor.execute("""SELECT word_stats.count FROM words, word_stats
|
||||||
|
WHERE words.word=%s AND
|
||||||
|
word_id=words.id AND
|
||||||
|
word_stats.user_id=%s""", word, id)
|
||||||
|
if cursor.rowcount == 0:
|
||||||
|
cursor.execute("""SELECT id FROM words WHERE word=%s""", word)
|
||||||
|
if cursor.rowcount == 0:
|
||||||
|
irc.error(msg, 'I\'m not keeping stats on %r.' % word)
|
||||||
|
else:
|
||||||
|
irc.error(msg, '%s has never said %r.' % (user, word))
|
||||||
|
return
|
||||||
|
count = int(cursor.fetchone()[0])
|
||||||
|
s = '%s has said %r %s.' % (user,word,utils.nItems(count, 'time'))
|
||||||
|
irc.reply(msg, s)
|
||||||
|
else:
|
||||||
|
# Figure out if we got a user or a word
|
||||||
|
try:
|
||||||
|
id = ircdb.users.getUserId(arg1)
|
||||||
|
except KeyError: # Maybe it was a nick. Check the hostmask.
|
||||||
|
try:
|
||||||
|
hostmask = irc.state.nickToHostmask(arg1)
|
||||||
|
id = ircdb.users.getUserId(hostmask)
|
||||||
|
except KeyError:
|
||||||
|
# okay, maybe it was a word
|
||||||
|
cursor.execute("""SELECT word FROM words
|
||||||
|
WHERE word=%s""", arg1)
|
||||||
|
if cursor.rowcount == 0:
|
||||||
|
irc.error(msg, '%r doesn\'t look like a user I know '
|
||||||
|
'or a word that I\'m keeping stats '
|
||||||
|
'on' % arg1)
|
||||||
|
return
|
||||||
|
cursor.execute("""SELECT word_stats.count,
|
||||||
|
word_stats.user_id
|
||||||
|
FROM words, word_stats
|
||||||
|
WHERE words.word=%s
|
||||||
|
AND words.id=word_stats.word_id
|
||||||
|
ORDER BY word_stats.count DESC
|
||||||
|
LIMIT 3""", arg1)
|
||||||
|
results = cursor.fetchall()
|
||||||
|
s = 'Top %s: ' % utils.nItems(cursor.rowcount,
|
||||||
|
'%rer' % arg1)
|
||||||
|
l = []
|
||||||
|
for (count, id) in results:
|
||||||
|
username = ircdb.users.users[id].name
|
||||||
|
l.append('%s: %s' % (username, count))
|
||||||
|
s += utils.commaAndify(l)
|
||||||
|
irc.reply(msg, s)
|
||||||
|
return
|
||||||
|
# It's a user, not a word
|
||||||
|
cursor.execute("""SELECT words.word, word_stats.count
|
||||||
|
FROM words, word_stats
|
||||||
|
WHERE words.id = word_stats.word_id
|
||||||
|
AND word_stats.user_id=%s
|
||||||
|
ORDER BY words.word""", id)
|
||||||
|
if cursor.rowcount == 0:
|
||||||
|
username = ircdb.users.users[id].name
|
||||||
|
irc.error('%r has no wordstats' % username)
|
||||||
|
return
|
||||||
|
l = [('%r: %s' % (word, count)) for \
|
||||||
|
(word, count) in cursor.fetchall()]
|
||||||
|
irc.reply(msg, utils.commaAndify(l))
|
||||||
|
|
||||||
Class = ChannelDB
|
Class = ChannelDB
|
||||||
|
|
||||||
|
|||||||
@ -87,7 +87,49 @@ if sqlite is not None:
|
|||||||
self.assertNotError('seen %s' % self.nick)
|
self.assertNotError('seen %s' % self.nick)
|
||||||
self.assertNotError('seen %s' % self.nick.upper())
|
self.assertNotError('seen %s' % self.nick.upper())
|
||||||
|
|
||||||
def testWordStats(self):
|
def testWordStatsNoArgs(self):
|
||||||
|
self.assertResponse('wordstats', 'I am not currently keeping any '
|
||||||
|
'word stats.')
|
||||||
|
self.assertNotError('addword lol')
|
||||||
|
self.assertResponse('wordstats', 'Currently keeping stats for: '
|
||||||
|
'\'lol\'')
|
||||||
|
|
||||||
|
def testWordStatsUser(self):
|
||||||
|
self.assertNotError('addword lol')
|
||||||
|
self.irc.feedMsg(ircmsgs.privmsg(self.channel, 'lol',
|
||||||
|
prefix=self.prefix))
|
||||||
|
self.assertResponse('wordstats foo', '\'lol\': 2')
|
||||||
|
self.assertNotError('addword moo')
|
||||||
|
self.irc.feedMsg(ircmsgs.privmsg(self.channel, 'moo',
|
||||||
|
prefix=self.prefix))
|
||||||
|
self.assertResponse('wordstats foo', '\'lol\': 2 and \'moo\': 2')
|
||||||
|
|
||||||
|
def testWordStatsWord(self):
|
||||||
|
userPrefix1 = 'moo!bar@baz'; userNick1 = 'moo'
|
||||||
|
userPrefix2 = 'boo!bar@baz'; userNick2 = 'boo'
|
||||||
|
self.irc.feedMsg(ircmsgs.privmsg(self.irc.nick,
|
||||||
|
'register %s bar' % userNick1,
|
||||||
|
prefix=userPrefix1))
|
||||||
|
self.irc.feedMsg(ircmsgs.privmsg(self.irc.nick,
|
||||||
|
'register %s bar' % userNick2,
|
||||||
|
prefix=userPrefix2))
|
||||||
|
_ = self.irc.takeMsg()
|
||||||
|
_ = self.irc.takeMsg()
|
||||||
|
self.assertNotError('addword lol')
|
||||||
|
self.assertResponse('wordstats lol', 'Top 1 \'lol\'er: foo: 1')
|
||||||
|
for i in range(5):
|
||||||
|
self.irc.feedMsg(ircmsgs.privmsg(self.channel, 'lol',
|
||||||
|
prefix=userPrefix1))
|
||||||
|
self.assertResponse('wordstats lol', 'Top 2 \'lol\'ers: %s: 5 '
|
||||||
|
'and foo: 2' % userNick1)
|
||||||
|
for i in range(10):
|
||||||
|
self.irc.feedMsg(ircmsgs.privmsg(self.channel, 'lol',
|
||||||
|
prefix=userPrefix2))
|
||||||
|
self.assertResponse('wordstats lol', 'Top 3 \'lol\'ers: %s: 10, '
|
||||||
|
'%s: 5, and foo: 3' % (\
|
||||||
|
userNick2, userNick1))
|
||||||
|
|
||||||
|
def testWordStatsUserWord(self):
|
||||||
self.assertNotError('addword lol')
|
self.assertNotError('addword lol')
|
||||||
self.assertResponse('wordstats foo lol',
|
self.assertResponse('wordstats foo lol',
|
||||||
'foo has said \'lol\' 1 time.')
|
'foo has said \'lol\' 1 time.')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user