Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-23 10:34:19 +01:00
Code Issues Projects Releases Wiki Activity

Updated wordstats to default to checking for a word first instead of a user in

Browse Source 
the case where there's only one arg supplied.
This commit is contained in:
Daniel DiPaolo 2003-11-06 20:21:59 +00:00
parent ea81e966ff
commit e00852b5ce
1 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/ChannelDB.py
View File

@ -468,7 +468,9 @@ class ChannelDB(callbacks.Privmsg,plugins.Toggleable,plugins.ChannelDBHandler):
for stats. With <user> alone, returns all the stats for that user. for stats. With <user> alone, returns all the stats for that user.
With <word> alone, returns the top users for that word. With <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 and <word>, returns that user's stat for that word. <channel> is only
needed if not said in the channel. needed if not said in the channel. (Note: if only one of <user> or
<word> is given, <word> is assumed first and only if no stats are
available for that word, do we assume it's <user>.)
""" """
channel = privmsgs.getChannel(msg, args) channel = privmsgs.getChannel(msg, args)
(arg1, arg2) = privmsgs.getArgs(args, needed=0, optional=2) (arg1, arg2) = privmsgs.getArgs(args, needed=0, optional=2)
@ -512,6 +514,9 @@ class ChannelDB(callbacks.Privmsg,plugins.Toggleable,plugins.ChannelDBHandler):
irc.reply(msg, s) irc.reply(msg, s)
else: else:
# Figure out if we got a user or a word # Figure out if we got a user or a word
cursor.execute("""SELECT word FROM words
WHERE word=%s""", arg1)
if cursor.rowcount == 0:
try: try:
id = ircdb.users.getUserId(arg1) id = ircdb.users.getUserId(arg1)
except KeyError: # Maybe it was a nick. Check the hostmask. except KeyError: # Maybe it was a nick. Check the hostmask.
@ -519,32 +524,10 @@ class ChannelDB(callbacks.Privmsg,plugins.Toggleable,plugins.ChannelDBHandler):
hostmask = irc.state.nickToHostmask(arg1) hostmask = irc.state.nickToHostmask(arg1)
id = ircdb.users.getUserId(hostmask) id = ircdb.users.getUserId(hostmask)
except KeyError: 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 ' irc.error(msg, '%r doesn\'t look like a user I know '
'or a word that I\'m keeping stats ' 'or a word that I\'m keeping stats '
'on' % arg1) 'on' % arg1)
return 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.getUser(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 cursor.execute("""SELECT words.word, word_stats.count
FROM words, word_stats FROM words, word_stats
WHERE words.id = word_stats.word_id WHERE words.id = word_stats.word_id
@ -557,6 +540,28 @@ class ChannelDB(callbacks.Privmsg,plugins.Toggleable,plugins.ChannelDBHandler):
l = [('%r: %s' % (word, count)) for \ l = [('%r: %s' % (word, count)) for \
(word, count) in cursor.fetchall()] (word, count) in cursor.fetchall()]
irc.reply(msg, utils.commaAndify(l)) irc.reply(msg, utils.commaAndify(l))
return
# It's a word, not a user
word = arg1
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""", word)
if cursor.rowcount == 0:
irc.error(msg, 'No one has said %r' % word)
return
results = cursor.fetchall()
s = 'Top %s: ' % utils.nItems(cursor.rowcount,
'%rer' % word)
l = []
for (count, id) in results:
username = ircdb.users.getUser(id).name
l.append('%s: %s' % (username, count))
s += utils.commaAndify(l)
irc.reply(msg, s)
Class = ChannelDB Class = ChannelDB