botfixes

rotbot/bot.py

@@ -149,8 +149,9 @@ class PyRot(irc.bot.SingleServerIRCBot):
                 return
 
                 # Nick \x02RotBot\x02 isn't registered.
-            if event.arguments[0].endswith(' is not a registered nickname.') or event.arguments[0].startswith('Nick ') and event.arguments[0].endswith(' isn\'t registered.'): # Username from database is not registered.
+            if event.arguments[0].endswith(' is not a registered nickname.') or event.arguments[0].startswith('Nick ') and event.arguments[0].endswith(' isn\'t registered.') or event.arguments[0] == 'Your nick isn\'t registered.': # Username from database is not registered.
                 connection.privmsg('NickServ', 'register %s spamtBK@xs4all.nl' % (self.network.password)) # Register with NickServ.
+                connection.privmsg(self.network.home_channel, 'Regisring %s%s%s with %sNickServ%s.' % (font.red, self.network.nickname, front.reset, font.red, font.reset))  # Recover control of nickname via NickServ, old style.
                 log.info('Registerring with NickServ.')
             if event.arguments[0].startswith('Nickname ') and event.arguments[0].endswith(' registered.'):
                 Inform.home_channel(seld, connection, 'Registerred nickname %s%s%s with NickServ.' % font.red, self.network.nickname, font.reset)

rotbot/common/networkservices.py

@@ -1,8 +1,8 @@
 class NickServ():
     def recover_nick(connection, password):
-        connection.privmsg('NickServ', 'IDENTIFY %s %s' % (connection.nickname, password)) # Identify with NickServ.
-        connection.privmsg('NickServ', 'RECOVER %s %s' % (connection.nickname, password))  # Recover control of nickname via NickServ.
-        connection.privmsg('NickServ', 'GHOST %s %s' % (connection.nickname, password))  # Recover control of nickname via NickServ, old style.
+        connection.privmsg('NickServ', 'IDENTIFY %s %s' % (self.network.nickname, password)) # Identify with NickServ.
+        connection.privmsg('NickServ', 'RECOVER %s %s' % (self.network.nickname, password))  # Recover control of nickname via NickServ.
+        connection.privmsg('NickServ', 'GHOST %s %s' % (self.network.nickname, password))  # Recover control of nickname via NickServ, old style.
         connection.nick(connection.nickname)    # Set original nickname. Should have happened during the nickServ recover, this fails when still connecting. So this creates a loop to successfully recover via NickServ.
 
 class ChanServ():

rotbot/events/on_join.py

@@ -1,16 +1,6 @@
-from common import log, queries
+from common import log, queries, font
 #from events.common import Lastact
 
-bold = "\x02"
-italic = "\x1D"
-underline = "\x1F"
-reverse = "\x16" 	# swap background and foreground colors ("reverse video")
-reset = "\x0F"
-blue = "\x0302"
-green = "\x0303"
-red = "\x0304"
-grey = "\x0314"
-
 def process_event(self, connection, event):
     log.info(event)
 
@@ -37,7 +27,7 @@ def process_event(self, connection, event):
         return  # Do not greet myself.
 
     # Promote owners.
-    if event.source.nick in self.channels[self.homechannel].owners():
+    if event.source.nick in self.channels[self.network.home_channel].owners():
         connection.mode(event.target, '+vhoa %s %s %s %s' % (event.source.nick, event.source.nick, event.source.nick, event.source.nick))
 
     # # Stop if greeting is not wanted.
@@ -51,20 +41,20 @@ def process_event(self, connection, event):
     # if not self.db.one("SELECT join_greeting FROM channels WHERE name='" + event.target + "' AND network ='" + self.network + "'"): # Do not greet users joining the channel.
     #     return
     # if joins == 1:
-    #     message = "Welcome to " + red + event.target + reset + ", " + red + event.source.nick + reset + ". For a list of command type " + blue + self.cmdchar + "cmd" + reset + "."
+    #     message = "Welcome to " + font.red + event.target + font.reset + ", " + font.red + event.source.nick + font.reset + ". For a list of command type " + blue + self.cmdchar + "cmd" + font.reset + "."
     # if joins == 3:
-    #     message = "Welcome back in " + red + event.target + reset + ", " + red + event.source.nick + reset + ". To turn of greetings, type " + blue + "!stopgreet" + reset + "."
+    #     message = "Welcome back in " + font.red + event.target + font.reset + ", " + font.red + event.source.nick + font.reset + ". To turn of greetings, type " + blue + "!stopgreet" + font.reset + "."
     # if joins == 5:
     #     if self.channels[event.target].has_key():   # Channel has a password.
-    #         message = "Welcome back again " + red + event.source.nick + reset + ". To automaticly join this channel type " + blue + "/ns ajoin " + reset + "ADD " + red + event.target + reset + italic + " password"
+    #         message = "Welcome back again " + font.red + event.source.nick + font.reset + ". To automaticly join this channel type " + blue + "/ns ajoin " + font.reset + "ADD " + font.red + event.target + font.reset + italic + " password"
     #     else:   # Channel does not have a password.
-    #         message = "Welcome back again " + red + event.source.nick + reset + ". To automaticly join this channel type " + blue + "/ns ajoin " + reset + "ADD " + red + event.source.nick + " " + event.target
+    #         message = "Welcome back again " + font.red + event.source.nick + font.reset + ". To automaticly join this channel type " + blue + "/ns ajoin " + font.reset + "ADD " + font.red + event.source.nick + " " + event.target
     # if joins < 100 and str(joins)[-1:] == "0":
-    #     message = red + event.source.nick + reset + " you have joined " + red + event.target + reset + " " + str(joins) + " times!"
+    #     message = font.red + event.source.nick + font.reset + " you have joined " + font.red + event.target + font.reset + " " + str(joins) + " times!"
     # if joins < 1000 and str(joins)[-2:] == "00" or joins < 1000 and str(joins)[-2:] == "50":
-    #     message = "Epic! " + red + event.source.nick + reset + " you have joined " + red + event.target + reset + " " + str(joins) + " times!"
+    #     message = "Epic! " + font.red + event.source.nick + font.reset + " you have joined " + font.red + event.target + font.reset + " " + str(joins) + " times!"
     # if joins < 10000 and str(joins)[-2:] == "00":
-    #     message = "AMAZING! " + red + event.source.nick + reset + " you have joined " + red + event.target + reset + " " + str(joins) + " times!"
+    #     message = "AMAZING! " + font.red + event.source.nick + font.reset + " you have joined " + font.red + event.target + font.reset + " " + str(joins) + " times!"
     # try:
     #     connection.privmsg(event.target, message)
     # except: