Browse Source

joinmessage crash fix

tBKwtWS 7 years ago
parent
commit
f4755dd60f
2 changed files with 10 additions and 4 deletions
  1. 3 3
      events/on_join.py
  2. 7 1
      rotbot.py

+ 3 - 3
events/on_join.py

@@ -41,11 +41,11 @@ def process_event(self, connection, event):
         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
     if joins < 100 and str(joins)[-1:] == "0":
-        message = red + event.source.nick + reset + " you have joined " + red + event.target + reset + " " + joins + " times!"
+        message = red + event.source.nick + reset + " you have joined " + red + event.target + 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 + " " + joins + " times!"
+        message = "Epic! " + red + event.source.nick + reset + " you have joined " + red + event.target + 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 + " " + joins + " times!"
+        message = "AMAZING! " + red + event.source.nick + reset + " you have joined " + red + event.target + reset + " " + str(joins) + " times!"
     try:
         connection.privmsg(event.target, message)
     except:

+ 7 - 1
rotbot.py

@@ -38,6 +38,8 @@ class PyRot(irc.bot.SingleServerIRCBot):
             sys.stderr.write(sys.exc_info()[1])
     
     # Events.
+    def on_all(self, connection, event):
+        print("ALL " + event)
     def on_nicknameinuse(self, connection, event):
         log.info("Nickname in use, attempting to recover: " + connection.nickname)
         connection.nick(connection.nickname + ''.join(random.choice(string.digits) for _ in range(3)))    # Take temporary nick. Without this recovering via NickServ won't work.
@@ -162,4 +164,8 @@ def main():
     bot.start()
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except KeyboardInterrupt:
+        log.info('Interrupted by keyboard.')
+        sys.exit(0)