Fix some inconsitency at time convert

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index 62254e6cc8e4321c0aea4834f3558944d6e83cfd..215bfb3a0e6659c0d34bc5a2f8814f70682f57c8 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -425,7 +425,7 @@ def print_thread(partner, me_nick, me_name):
     """
     # Sort messages by time
     messages = dg['thread'][partner]
-    messages.sort(key=lambda x: parser.parse(x['created_at']))
+    messages.sort(key=lambda x: int(x['created_at']))
     # Use legacy display on non-ascii text message
     ms = [m['text'] for m in messages]
     ums = [m for m in ms if not all(ord(c) < 128 for c in m)]
@@ -597,10 +597,10 @@ def print_message(m):
     """
     # Retrieve message
     sender_screen_name = '@' + m['sender_screen_name']
-    sender_name = m['sender']['name']
+    sender_name = m['sender_name']
     text = unescape(m['text'])
     recipient_screen_name = '@' + m['recipient_screen_name']
-    recipient_name = m['recipient']['name']
+    recipient_name = m['recipient_name']
     mid = m['id']
     date = parser.parse(m['created_at'])
     date = arrow.get(date).to('local').datetime

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 5154d6ef6b429ee94dcc80ec745569d5a58d8427..02bd2a98b34aa8f2cb539545634cd87f2740eb2d 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -838,8 +838,8 @@ def inbox():
     # Get inbox messages
     messages = t.direct_messages.events.list()['events']
     messages = list(map(map_message, messages))
-    inbox = filter(inboxFilter, messages)
-    sent = filter(inboxFilter, messages)
+    inbox = list(filter(inboxFilter, messages))
+    sent = list(filter(inboxFilter, messages))
 
     d = {}
     uniq_inbox = list(set(