Messages new API adaption

[rainbowstream.git] / rainbowstream / rainbow.py

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index ee1c805fefc125b10f7faf7999a8dc3b92dc9176..e231ba04b2777b142800936c82e28a6d00d70440 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -336,7 +336,8 @@ def poll():
 
     kwargs = add_tweetmode_parameter(kwargs)
     result = t.statuses.home_timeline(**kwargs)
-    g['since_id'] = result[0]
+    if result:
+        g['since_id'] = result[0]['id']
     for tweet in reversed(result):
         draw(t=tweet)
     printNicely('')
@@ -815,45 +816,17 @@ def inbox():
     num = c['MESSAGES_DISPLAY']
     if g['stuff'].isdigit():
         num = g['stuff']
+
+    def inboxFilter(message):
+        return message['sender_screen_name'] == g['original_name']
+    def sentFilter(message):
+        return message['recipient_screen_name'] == g['original_name']
+
     # Get inbox messages
-    cur_page = 1
-    inbox = []
-    while num > 20:
-        inbox = inbox + t.direct_messages(
-            count=20,
-            page=cur_page,
-            include_entities=False,
-            skip_status=False
-        )
-        num -= 20
-        cur_page += 1
-    inbox = inbox + t.direct_messages(
-        count=num,
-        page=cur_page,
-        include_entities=False,
-        skip_status=False
-    )
-    # Get sent messages
-    num = c['MESSAGES_DISPLAY']
-    if g['stuff'].isdigit():
-        num = g['stuff']
-    cur_page = 1
-    sent = []
-    while num > 20:
-        sent = sent + t.direct_messages.sent(
-            count=20,
-            page=cur_page,
-            include_entities=False,
-            skip_status=False
-        )
-        num -= 20
-        cur_page += 1
-    sent = sent + t.direct_messages.sent(
-        count=num,
-        page=cur_page,
-        include_entities=False,
-        skip_status=False
-    )
+    messages = []
+    messages = messages + t.direct_messages.events.list()['events']
+    inbox = filter(inboxFilter, messages)
+    sent = filter(inboxFilter, messages)
 
     d = {}
     uniq_inbox = list(set(