Merge pull request #2 from Marcus316/patch-2

Fix possible timing issue. Thanks ~marcus

Code/irc/tildebot.py

@@ -154,44 +154,45 @@ def listen():
   while 1:
 
     ircmsg = ircsock.recv(2048)
-    ircmsg = ircmsg.strip('\n\r')
+    for msg in ircmsg.split('\n'):
+      msg = msg.strip('\n\r')
 
-    if ircmsg.find("PING :") != -1:
+      if msg.find("PING :") != -1:
-      ping()
+        ping()
 
-    formatted = formatter.format_message(ircmsg)
+      formatted = formatter.format_message(msg)
 
-    if "" == formatted:
+      if "" == formatted:
-      continue
+        continue
 
     # print formatted
 
-    split = formatted.split("\t")
+      split = formatted.split("\t")
-    iTime = split[0]
+      iTime = split[0]
-    user = split[1]
+      user = split[1]
-    command = split[2]
+      command = split[2]
-    channel = split[3]
+      channel = split[3]
-    messageText = split[4]
+      messageText = split[4]
 
-    if ircmsg.find(":!tildescore") != -1:
+      if msg.find(":!tildescore") != -1:
         show_tildescore(channel, user)
-    elif ircmsg.find(":!tilde") != -1 and not challenges.has_key(user):
+      elif msg.find(":!tilde") != -1 and not challenges.has_key(user):
         challenge(channel, user, iTime)
-    elif challenges.has_key(user):
+      elif challenges.has_key(user):
         challenge_response(channel, user, iTime, messageText)
         #give_tilde(channel, user, iTime)
 
-    if ircmsg.find(":!jackpot") != -1:
+      if msg.find(":!jackpot") != -1:
         show_jackpot(channel)
 
-    if ircmsg.find(":!rollcall") != -1:
+      if msg.find(":!rollcall") != -1:
-      rollcall(channel)
+        rollcall(channel)
 
-    if ircmsg.find("PING :") != -1:
+      if msg.find("PING :") != -1:
-      ping()
+        ping()
 
-    sys.stdout.flush()
+  sys.stdout.flush()
-    time.sleep(1)
+  time.sleep(1)
 
 ircsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 connect(options.server, options.channel, options.nick)