minor fixes

commands/admin.py

@@ -60,7 +60,7 @@ def do_command(self, connection, event):
                 self.die(msg = "[" + event.source.nick + "] " + command.split(maxsplit=1)[1])
     
     elif command.split()[0] == "reconnect":
-        if not self.channels[self.homechannel].is_owner(event.source.nick) and not self.channels[self.homechannel].is_admin(event.source.nick) and not self.channels[self.homechannel].is_oper(event.source.nick): 
+        if not userstatus.atleast_oper(self, event.source.nick, self.homechannel): 
             connection.privmsg(replyto, "Denied, you need to have operator status or higher in " + red + self.homechannel  + reset + ".")
             return
         if cmdtype == "help":    # Display help text.

events/on_pubmsg.py

@@ -65,7 +65,8 @@ def process_event(self, connection, event):
             return
         
         # Stop if lamed recently.
-        if self.db.one("SELECT last_lame FROM channels WHERE name='" + event.target + "' AND network='" + self.network + "'") > datetime.datetime.now() - datetime.timedelta(minutes=2):    # In the last 2 minutes.
+        lastlame = self.db.one("SELECT last_lame FROM channels WHERE name='" + event.target + "' AND network='" + self.network + "'")
+        if lastlame and lastlame > datetime.datetime.now() - datetime.timedelta(minutes=2):    # In the last 2 minutes.
             return
         
         # Update lastlame.