Add Hatem to AUTHORS file, prep for 0.4.5 release soonish

[z_archive/twitter.git] / twitter / ircbot.py

diff --git a/twitter/ircbot.py b/twitter/ircbot.py
index c5363eadb5ffd7a6fca142f8ce377589bd8f8e9f..876007d95781056781c29e9d6ed0e8f2c35a9dc1 100644 (file)
--- a/twitter/ircbot.py
+++ b/twitter/ircbot.py
@@ -27,11 +27,7 @@ password: <twitter_account_password>
 
 """
 
-# TODO add delimiter if first word isn't "is" or "was"
-# TODO handle newlines
-# TODO handle quotes
-
-BOT_VERSION = "TwitterBot 0.2.1 (mike.verdone.ca/twitter)"
+BOT_VERSION = "TwitterBot 0.4 (mike.verdone.ca/twitter)"
 
 IRC_BOLD = chr(0x02)
 IRC_ITALIC = chr(0x16)
@@ -41,11 +37,12 @@ IRC_REGULAR = chr(0x0f)
 import sys
 import time
 from dateutil.parser import parse
-from ConfigParser import ConfigParser
+from ConfigParser import SafeConfigParser
 from heapq import heappop, heappush
 import traceback
 
 from api import Twitter, TwitterError
+from util import htmlentitydecode
 
 try:
     import irclib
@@ -85,19 +82,17 @@ class Scheduler(object):
         now = time.time()
         task = heappop(self.task_heap)
         wait = task.next - now
+        task.next = now + task.delta
+        heappush(self.task_heap, task)
         if (wait > 0):
             time.sleep(wait)
         task()
-        task.next = now + task.delta
-        heappush(self.task_heap, task)
         debug("tasks: " + str(self.task_heap))
         
     def run_forever(self):
-        try:
-            while True:
-                self.next_task()
-        except KeyboardInterrupt:
-            pass
+        while True:
+            self.next_task()
+
             
 class TwitterBot(object):
     def __init__(self, configFilename):
@@ -124,22 +119,28 @@ class TwitterBot(object):
             traceback.print_exc(file=sys.stderr)
             return
         
+        nextLastUpdate = self.lastUpdate
         for update in updates:
             crt = parse(update['created_at']).utctimetuple()
             if (crt > self.lastUpdate):
-                text = (
-                    update['text']
-                    .replace('\n', ' ')
-                    .replace("&quot;", "\"")
-                    .replace('&amp;', '&'))
-                self.privmsg_channel(
-                    "=^_^= %s%s%s %s" %(
-                        IRC_BOLD, update['user']['screen_name'],
-                        IRC_BOLD, text))
-                self.lastUpdate = crt
+                text = (htmlentitydecode(
+                    update['text'].replace('\n', ' '))
+                    .encode('utf-8', 'replace'))
+
+                # Skip updates beginning with @
+                # TODO This would be better if we only ignored messages
+                #   to people who are not on our following list.
+                if not text.startswith("@"):
+                    self.privmsg_channel(
+                        u"=^_^=  %s%s%s %s" %(
+                            IRC_BOLD, update['user']['screen_name'],
+                            IRC_BOLD, text.decode('utf-8')))
+                
+                nextLastUpdate = crt
             else:
                 break
-
+        self.lastUpdate = nextLastUpdate
+        
     def process_events(self):
         debug("In process_events")
         self.irc.process_once()
@@ -176,7 +177,7 @@ class TwitterBot(object):
 
     def privmsg_channel(self, msg):
         return self.ircServer.privmsg(
-            self.config.get('irc', 'channel'), msg)
+            self.config.get('irc', 'channel'), msg.encode('utf-8'))
             
     def follow(self, conn, evt, name):
         userNick = evt.source().split('!')[0]
@@ -224,14 +225,19 @@ class TwitterBot(object):
             self.config.getint('irc', 'port'),
             self.config.get('irc', 'nick'))
         self.ircServer.join(self.config.get('irc', 'channel'))
-        try:
-            self.sched.run_forever()
-        except KeyboardInterrupt:
-            pass
+
+        while True:
+            try:
+                self.sched.run_forever()
+            except KeyboardInterrupt:
+                break
+            except TwitterError:
+                # twitter.com is probably down because it sucks. ignore the fault and keep going
+                pass
 
 def load_config(filename):
     defaults = dict(server=dict(port=6667, nick="twitterbot"))
-    cp = ConfigParser(defaults)
+    cp = SafeConfigParser(defaults)
     cp.read((filename,))
     return cp