Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-17 06:00:42 +01:00
Code Issues Projects Releases Wiki Activity

Changed out some try blocks for if/else

Browse Source
This commit is contained in:
James Vega 2003-08-23 05:21:45 +00:00
parent 749003dab7
commit b86205ae8b
1 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
plugins/FunDB.py
View File

@ -155,25 +155,25 @@ class FunDB(callbacks.Privmsg):
WHERE insult NOT NULL WHERE insult NOT NULL
ORDER BY random() ORDER BY random()
LIMIT 1""") LIMIT 1""")
try: if cursor.rowcount == 0:
(id, insult) = cursor.fetchone()
except TypeError:
irc.error(msg, 'There are currently no available insults.') irc.error(msg, 'There are currently no available insults.')
return return
sql = """UPDATE insults SET use_count=use_count+1, requested_by=%s
WHERE id=%s"""
cursor.execute(sql, msg.prefix, id)
if nick.strip() in (irc.nick, 'himself', 'me'):
insultee = msg.nick
else: else:
insultee = nick (id, insult) = cursor.fetchone()
if ircutils.isChannel(msg.args[0]): sql = """UPDATE insults SET use_count=use_count+1, requested_by=%s
means = msg.args[0] WHERE id=%s"""
s = '%s: %s (#%s)' % (insultee, insult, id) cursor.execute(sql, msg.prefix, id)
else: if nick.strip() in (irc.nick, 'himself', 'me'):
means = insultee insultee = msg.nick
s = insult else:
irc.queueMsg(ircmsgs.privmsg(means, s)) insultee = nick
if ircutils.isChannel(msg.args[0]):
means = msg.args[0]
s = '%s: %s (#%s)' % (insultee, insult, id)
else:
means = insultee
s = insult
irc.queueMsg(ircmsgs.privmsg(means, s))
def crossword(self, irc, msg, args): def crossword(self, irc, msg, args):
"""<word> """<word>
@ -202,15 +202,14 @@ class FunDB(callbacks.Privmsg):
WHERE excuse NOTNULL WHERE excuse NOTNULL
ORDER BY random() ORDER BY random()
LIMIT 1""") LIMIT 1""")
try: if cursor.rowcount == 0:
(id, excuse) = cursor.fetchone()
except TypeError:
irc.error(msg, 'There are currently no available excuses.') irc.error(msg, 'There are currently no available excuses.')
return else:
sql = """UPDATE excuses SET use_count=use_count+1, requested_by=%s (id, excuse) = cursor.fetchone()
WHERE id=%s""" sql = """UPDATE excuses SET use_count=use_count+1, requested_by=%s
cursor.execute(sql, msg.prefix, id) WHERE id=%s"""
irc.reply(msg, '%s (#%s)' % (excuse, id)) cursor.execute(sql, msg.prefix, id)
irc.reply(msg, '%s (#%s)' % (excuse, id))
def dbadd(self, irc, msg, args): def dbadd(self, irc, msg, args):
"""<lart|excuse|insult|praise> <text> """<lart|excuse|insult|praise> <text>
@ -362,20 +361,19 @@ class FunDB(callbacks.Privmsg):
WHERE lart NOTNULL WHERE lart NOTNULL
ORDER BY random() ORDER BY random()
LIMIT 1""") LIMIT 1""")
try: if cursor.rowcount == 0:
(id, lart) = cursor.fetchone()
except TypeError:
irc.error(msg, 'There are currently no available larts.') irc.error(msg, 'There are currently no available larts.')
return
sql = """UPDATE larts SET use_count=use_count+1, requested_by=%s
WHERE id=%s"""
cursor.execute(sql, msg.prefix, id)
if nick == irc.nick or nick == 'me':
lartee = msg.nick
else: else:
lartee = nick (id, lart) = cursor.fetchone()
lart = lart.replace("$who", lartee) sql = """UPDATE larts SET use_count=use_count+1, requested_by=%s
irc.queueMsg(ircmsgs.action(channel, '%s (#%s)' % (lart, id))) WHERE id=%s"""
cursor.execute(sql, msg.prefix, id)
if nick == irc.nick or nick == 'me':
lartee = msg.nick
else:
lartee = nick
lart = lart.replace("$who", lartee)
irc.queueMsg(ircmsgs.action(channel, '%s (#%s)' % (lart, id)))
def praise(self, irc, msg, args): def praise(self, irc, msg, args):
"""[<channel>] <nick> """[<channel>] <nick>
@ -390,21 +388,20 @@ class FunDB(callbacks.Privmsg):
WHERE praise NOTNULL WHERE praise NOTNULL
ORDER BY random() ORDER BY random()
LIMIT 1""") LIMIT 1""")
try: if cursor.rowcount == 0:
(id, praise) = cursor.fetchone()
except TypeError:
irc.error(msg, 'There are currently no available praises.') irc.error(msg, 'There are currently no available praises.')
return
sql = """UPDATE praises SET use_count=use_count+1, requested_by=%s
WHERE id=%s"""
cursor.execute(sql, msg.prefix, id)
self.db.commit()
if nick == irc.nick or nick == 'me':
praisee = msg.nick
else: else:
praisee = nick (id, praise) = cursor.fetchone()
praise = praise.replace("$who", praisee) sql = """UPDATE praises SET use_count=use_count+1, requested_by=%s
irc.queueMsg(ircmsgs.action(channel, '%s (#%s)' % (praise, id))) WHERE id=%s"""
cursor.execute(sql, msg.prefix, id)
self.db.commit()
if nick == irc.nick or nick == 'me':
praisee = msg.nick
else:
praisee = nick
praise = praise.replace("$who", praisee)
irc.queueMsg(ircmsgs.action(channel, '%s (#%s)' % (praise, id)))
def addword(self, irc, msg, args): def addword(self, irc, msg, args):
"""<word> """<word>