cleaning up TODOs and FIXMEs

diff --git a/bot.py b/bot.py
index fe9be344525fa60a2a7bbdd47f53eb382f3a7236..e5bcebedc4b5bf5b049f2c00e667bde91d9fc9cb 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -3,8 +3,6 @@
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
 
-#TODO: error checking
-
 import socket, sys
 
 #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')}
@@ -93,7 +91,7 @@ class Bot(object):
                                self.parent.user(nick).quit()
                                del self.parent.users[nick.lower()]
 
-               elif pieces[1] == "MODE": #TODO
+               elif pieces[1] == "MODE": #TODO parse for ops/voices (at least)
                        pass
 
        
@@ -120,7 +118,7 @@ class Bot(object):
                                                pieces.pop(1)
 
                else: # message was sent to a channel
-                       chan = self.parent.channel(target) #TODO check if bot's on channel --- in Erebus.channel() maybe?
+                       chan = self.parent.channel(target)
                        try:
                                if msg[0] == '*': # message may be addressed to bot by "*BOTNICK" trigger?
                                        if pieces[0][1:].lower() == self.nick.lower():

diff --git a/erebus.py b/erebus.py
index 2783bd5a32d4846cf64089203bb4122b8e623141..6bc5246f48aca235c3d27eacc4daeadd6541d729 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -3,8 +3,6 @@
 # Erebus IRC bot - Author: John Runyon
 # main startup code
 
-#TODO: tons
-
 import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
 import bot, config, ctlmod
 

diff --git a/modules/trivia.py b/modules/trivia.py
index 2d608cfca4aa208ac4469183b849a793f18dd1a0..90a2dbf2f12cd31a0dcc60725119872d787e89b2 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -363,8 +363,7 @@ def cmd_start(bot, user, chan, realtarget, *args):
        else:
                bot.msg(replyto, "Game is already started!")
 
-#FIXME @lib.hook('stop', clevel=lib.KNOWN, needchan=False)
-@lib.hook('stop', needchan=False) #FIXME
+@lib.hook('stop', clevel=lib.KNOWN, needchan=False)
 def cmd_stop(bot, user, chan, realtarget, *args):
        if stop():
                bot.msg(state.chan, "Game stopped by %s" % (user))
@@ -454,7 +453,7 @@ def cmd_hintnum(bot, user, chan, realtarget, *args):
 
 @lib.hook('findq', clevel=lib.KNOWN, needchan=False)
 def cmd_findquestion(bot, user, chan, realtarget, *args):
-       matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i]['question'] == ' '.join(args)] #FIXME: looser equality check
+       matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i]['question'] == ' '.join(args)] #TODO looser equality check
        if len(matches) > 1:
                bot.msg(user, "Multiple matches: %s" % (', '.join(matches)))
        elif len(matches) == 1: