add debug option
[rainbowstream.git] / rainbowstream / rainbow.py
index dfbfb3b7ac3d559e7ad5a76bc92e88a1504c4197..72e2160390283159a2cc02a3a31f2c47eafed8c1 100644 (file)
@@ -1,6 +1,3 @@
-"""
-Colorful user's timeline stream
-"""
 import os
 import os.path
 import sys
@@ -10,6 +7,7 @@ import time
 import threading
 import requests
 import webbrowser
+import traceback
 
 from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup
 from twitter.api import *
@@ -53,6 +51,11 @@ def parse_arguments():
         '-ig',
         '--ignore',
         help='Ignore specific screen_name.')
+    parser.add_argument(
+        '-dg',
+        '--debug',
+        action='store_true',
+        help='Run in debug mode.')
     parser.add_argument(
         '-iot',
         '--image-on-term',
@@ -111,6 +114,14 @@ def build_mute_dict(dict_data=False):
         return screen_name_list
 
 
+def debug_option():
+    """
+    Save traceback when run in debug mode
+    """
+    if g['debug']:
+        g['traceback'].append(traceback.format_exc())
+
+
 def init(args):
     """
     Init function
@@ -120,21 +131,33 @@ def init(args):
     signal.signal(signal.SIGINT, ctrl_c_handler)
     # Get name
     t = Twitter(auth=authen())
-    name = '@' + t.account.verify_credentials()['screen_name']
+    credential = t.account.verify_credentials()
+    screen_name = '@' + credential['screen_name']
+    name = credential['name']
     if not get_config('PREFIX'):
-        set_config('PREFIX', name)
-    g['original_name'] = name[1:]
+        set_config('PREFIX', screen_name)
+    g['PREFIX'] = u2str(c['PREFIX'])
+    c['original_name'] = g['original_name'] = screen_name[1:]
+    g['full_name'] = name
     g['decorated_name'] = lambda x: color_func(
         c['DECORATED_NAME'])('[' + x + ']: ')
     # Theme init
     files = os.listdir(os.path.dirname(__file__) + '/colorset')
     themes = [f.split('.')[0] for f in files if f.split('.')[-1] == 'json']
     g['themes'] = themes
+    g['pause'] = False
+    g['message_threads'] = {}
+    # Events
+    g['events'] = []
     # Startup cmd
     g['cmd'] = ''
+    # Debug option
+    g['debug'] = args.debug
+    g['traceback'] = []
+    # Retweet of mine events
+    c['events'] = []
     # Semaphore init
     c['lock'] = False
-    c['pause'] = False
     # Init tweet dict and message dict
     c['tweet_dict'] = []
     c['message_dict'] = []
@@ -145,67 +168,6 @@ def init(args):
     c['IGNORE_LIST'] += build_mute_dict()
 
 
-def switch():
-    """
-    Switch stream
-    """
-    try:
-        target = g['stuff'].split()[0]
-        # Filter and ignore
-        args = parse_arguments()
-        try:
-            if g['stuff'].split()[-1] == '-f':
-                guide = 'To ignore an option, just hit Enter key.'
-                printNicely(light_magenta(guide))
-                only = raw_input('Only nicks [Ex: @xxx,@yy]: ')
-                ignore = raw_input('Ignore nicks [Ex: @xxx,@yy]: ')
-                args.filter = filter(None, only.split(','))
-                args.ignore = filter(None, ignore.split(','))
-            elif g['stuff'].split()[-1] == '-d':
-                args.filter = c['ONLY_LIST']
-                args.ignore = c['IGNORE_LIST']
-        except:
-            printNicely(red('Sorry, wrong format.'))
-            return
-        # Public stream
-        if target == 'public':
-            keyword = g['stuff'].split()[1]
-            if keyword[0] == '#':
-                keyword = keyword[1:]
-            # Kill old thread
-            g['stream_stop'] = True
-            args.track_keywords = keyword
-            # Start new thread
-            th = threading.Thread(
-                target=stream,
-                args=(
-                    c['PUBLIC_DOMAIN'],
-                    args))
-            th.daemon = True
-            th.start()
-        # Personal stream
-        elif target == 'mine':
-            # Kill old thread
-            g['stream_stop'] = True
-            # Start new thread
-            th = threading.Thread(
-                target=stream,
-                args=(
-                    c['USER_DOMAIN'],
-                    args,
-                    g['original_name']))
-            th.daemon = True
-            th.start()
-        printNicely('')
-        if args.filter:
-            printNicely(cyan('Only: ' + str(args.filter)))
-        if args.ignore:
-            printNicely(red('Ignore: ' + str(args.ignore)))
-        printNicely('')
-    except:
-        printNicely(red('Sorry I can\'t understand.'))
-
-
 def trend():
     """
     Trend
@@ -255,6 +217,51 @@ def home():
     printNicely('')
 
 
+def notification():
+    """
+    Show notifications
+    """
+    g['events'] = g['events'] + c['events']
+    if g['events']:
+        for e in g['events']:
+            print_event(e)
+        printNicely('')
+    else:
+        printNicely(magenta('Nothing at this time.'))
+
+
+def mentions():
+    """
+    Mentions timeline
+    """
+    t = Twitter(auth=authen())
+    num = c['HOME_TWEET_NUM']
+    if g['stuff'].isdigit():
+        num = int(g['stuff'])
+    for tweet in reversed(t.statuses.mentions_timeline(count=num)):
+        draw(t=tweet)
+    printNicely('')
+
+
+def whois():
+    """
+    Show profile of a specific user
+    """
+    t = Twitter(auth=authen())
+    screen_name = g['stuff'].split()[0]
+    if screen_name.startswith('@'):
+        try:
+            user = t.users.show(
+                screen_name=screen_name[1:],
+                include_entities=False)
+            show_profile(user)
+        except:
+            debug_option()
+            printNicely(red('No user.'))
+    else:
+        printNicely(red('A name should begin with a \'@\''))
+
+
 def view():
     """
     Friend view
@@ -273,17 +280,32 @@ def view():
         printNicely(red('A name should begin with a \'@\''))
 
 
-def mentions():
+def search():
     """
-    Mentions timeline
+    Search
     """
     t = Twitter(auth=authen())
-    num = c['HOME_TWEET_NUM']
-    if g['stuff'].isdigit():
-        num = int(g['stuff'])
-    for tweet in reversed(t.statuses.mentions_timeline(count=num)):
-        draw(t=tweet)
-    printNicely('')
+    # Setup query
+    query = g['stuff'].strip()
+    type = c['SEARCH_TYPE']
+    if type not in ['mixed', 'recent', 'popular']:
+        type = 'mixed'
+    max_record = c['SEARCH_MAX_RECORD']
+    count = min(max_record, 100)
+    # Perform search
+    rel = t.search.tweets(
+        q=query,
+        type=type,
+        count=count
+    )['statuses']
+    # Return results
+    if rel:
+        printNicely('Newest tweets:')
+        for i in reversed(xrange(count)):
+            draw(t=rel[i], keyword=query)
+        printNicely('')
+    else:
+        printNicely(magenta('I\'m afraid there is no result'))
 
 
 def tweet():
@@ -362,9 +384,9 @@ def allretweet():
     printNicely('')
 
 
-def favorite():
+def conversation():
     """
-    Favorite
+    Conversation view
     """
     t = Twitter(auth=authen())
     try:
@@ -373,9 +395,19 @@ def favorite():
         printNicely(red('Sorry I can\'t understand.'))
         return
     tid = c['tweet_dict'][id]
-    t.favorites.create(_id=tid, include_entities=False)
-    printNicely(green('Favorited.'))
-    draw(t.statuses.show(id=tid))
+    tweet = t.statuses.show(id=tid)
+    limit = c['CONVERSATION_MAX']
+    thread_ref = []
+    thread_ref.append(tweet)
+    prev_tid = tweet['in_reply_to_status_id']
+    while prev_tid and limit:
+        limit -= 1
+        tweet = t.statuses.show(id=prev_tid)
+        prev_tid = tweet['in_reply_to_status_id']
+        thread_ref.append(tweet)
+
+    for tweet in reversed(thread_ref):
+        draw(t=tweet)
     printNicely('')
 
 
@@ -396,9 +428,9 @@ def reply():
     t.statuses.update(status=status, in_reply_to_status_id=tid)
 
 
-def delete():
+def favorite():
     """
-    Delete
+    Favorite
     """
     t = Twitter(auth=authen())
     try:
@@ -407,8 +439,10 @@ def delete():
         printNicely(red('Sorry I can\'t understand.'))
         return
     tid = c['tweet_dict'][id]
-    t.statuses.destroy(id=tid)
-    printNicely(green('Okay it\'s gone.'))
+    t.favorites.create(_id=tid, include_entities=False)
+    printNicely(green('Favorited.'))
+    draw(t.statuses.show(id=tid))
+    printNicely('')
 
 
 def unfavorite():
@@ -428,41 +462,19 @@ def unfavorite():
     printNicely('')
 
 
-def search():
-    """
-    Search
-    """
-    t = Twitter(auth=authen())
-    g['stuff'] = g['stuff'].strip()
-    rel = t.search.tweets(q=g['stuff'])['statuses']
-    if rel:
-        printNicely('Newest tweets:')
-        for i in reversed(xrange(c['SEARCH_MAX_RECORD'])):
-            draw(t=rel[i],
-                 keyword=g['stuff'])
-        printNicely('')
-    else:
-        printNicely(magenta('I\'m afraid there is no result'))
-
-
-def message():
+def delete():
     """
-    Send a direct message
+    Delete
     """
     t = Twitter(auth=authen())
-    user = g['stuff'].split()[0]
-    if user[0].startswith('@'):
-        try:
-            content = g['stuff'].split()[1]
-        except:
-            printNicely(red('Sorry I can\'t understand.'))
-        t.direct_messages.new(
-            screen_name=user[1:],
-            text=content
-        )
-        printNicely(green('Message sent.'))
-    else:
-        printNicely(red('A name should begin with a \'@\''))
+    try:
+        id = int(g['stuff'].split()[0])
+    except:
+        printNicely(red('Sorry I can\'t understand.'))
+        return
+    tid = c['tweet_dict'][id]
+    t.statuses.destroy(id=tid)
+    printNicely(green('Okay it\'s gone.'))
 
 
 def show():
@@ -483,6 +495,7 @@ def show():
             img = Image.open(BytesIO(res.content))
             img.show()
     except:
+        debug_option()
         printNicely(red('Sorry I can\'t show this image.'))
 
 
@@ -496,73 +509,32 @@ def urlopen():
             return
         tid = c['tweet_dict'][int(g['stuff'])]
         tweet = t.statuses.show(id=tid)
-        link_ary = [
-            u for u in tweet['text'].split() if u.startswith('http://')]
+        link_prefix = ('http://', 'https://')
+        link_ary = [u for u in tweet['text'].split()
+                    if u.startswith(link_prefix)]
         if not link_ary:
             printNicely(light_magenta('No url here @.@!'))
             return
         for link in link_ary:
             webbrowser.open(link)
     except:
+        debug_option()
         printNicely(red('Sorry I can\'t open url in this tweet.'))
 
 
-def ls():
-    """
-    List friends for followers
-    """
-    t = Twitter(auth=authen())
-    # Get name
-    try:
-        name = g['stuff'].split()[1]
-        if name.startswith('@'):
-            name = name[1:]
-        else:
-            printNicely(red('A name should begin with a \'@\''))
-            raise Exception('Invalid name')
-    except:
-        name = g['original_name']
-    # Get list followers or friends
-    try:
-        target = g['stuff'].split()[0]
-    except:
-        printNicely(red('Omg some syntax is wrong.'))
-    # Init cursor
-    d = {'fl': 'followers', 'fr': 'friends'}
-    next_cursor = -1
-    rel = {}
-    # Cursor loop
-    while next_cursor != 0:
-        list = getattr(t, d[target]).list(
-            screen_name=name,
-            cursor=next_cursor,
-            skip_status=True,
-            include_entities=False,
-        )
-        for u in list['users']:
-            rel[u['name']] = '@' + u['screen_name']
-        next_cursor = list['next_cursor']
-    # Print out result
-    printNicely('All: ' + str(len(rel)) + ' ' + d[target] + '.')
-    for name in rel:
-        user = '  ' + cycle_color(name)
-        user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
-        printNicely(user)
-
-
 def inbox():
     """
-    Inbox direct messages
+    Inbox threads
     """
     t = Twitter(auth=authen())
     num = c['MESSAGES_DISPLAY']
-    rel = []
     if g['stuff'].isdigit():
         num = g['stuff']
+    # Get inbox messages
     cur_page = 1
-    # Max message per page is 20 so we have to loop
+    inbox = []
     while num > 20:
-        rel = rel + t.direct_messages(
+        inbox = inbox + t.direct_messages(
             count=20,
             page=cur_page,
             include_entities=False,
@@ -570,32 +542,20 @@ def inbox():
         )
         num -= 20
         cur_page += 1
-    rel = rel + t.direct_messages(
+    inbox = inbox + t.direct_messages(
         count=num,
         page=cur_page,
         include_entities=False,
         skip_status=False
     )
-    # Display
-    printNicely('Inbox: newest ' + str(len(rel)) + ' messages.')
-    for m in reversed(rel):
-        print_message(m)
-    printNicely('')
-
-
-def sent():
-    """
-    Sent direct messages
-    """
-    t = Twitter(auth=authen())
+    # Get sent messages
     num = c['MESSAGES_DISPLAY']
-    rel = []
     if g['stuff'].isdigit():
-        num = int(g['stuff'])
+        num = g['stuff']
     cur_page = 1
-    # Max message per page is 20 so we have to loop
+    sent = []
     while num > 20:
-        rel = rel + t.direct_messages.sent(
+        sent = sent + t.direct_messages.sent(
             count=20,
             page=cur_page,
             include_entities=False,
@@ -603,17 +563,66 @@ def sent():
         )
         num -= 20
         cur_page += 1
-    rel = rel + t.direct_messages.sent(
+    sent = sent + t.direct_messages.sent(
         count=num,
         page=cur_page,
         include_entities=False,
         skip_status=False
     )
-    # Display
-    printNicely('Sent: newest ' + str(len(rel)) + ' messages.')
-    for m in reversed(rel):
-        print_message(m)
-    printNicely('')
+
+    d = {}
+    uniq_inbox = list(set(
+        [(m['sender_screen_name'], m['sender']['name']) for m in inbox]
+    ))
+    uniq_sent = list(set(
+        [(m['recipient_screen_name'], m['recipient']['name']) for m in sent]
+    ))
+    for partner in uniq_inbox:
+        inbox_ary = [m for m in inbox if m['sender_screen_name'] == partner[0]]
+        sent_ary = [
+            m for m in sent if m['recipient_screen_name'] == partner[0]]
+        d[partner] = inbox_ary + sent_ary
+    for partner in uniq_sent:
+        if partner not in d:
+            d[partner] = [
+                m for m in sent if m['recipient_screen_name'] == partner[0]]
+    g['message_threads'] = print_threads(d)
+
+
+def thread():
+    """
+    View a thread of message
+    """
+    try:
+        thread_id = int(g['stuff'])
+        print_thread(
+            g['message_threads'][thread_id],
+            g['original_name'],
+            g['full_name'])
+    except Exception:
+        debug_option()
+        printNicely(red('No such thread.'))
+
+
+def message():
+    """
+    Send a direct message
+    """
+    t = Twitter(auth=authen())
+    try:
+        user = g['stuff'].split()[0]
+        if user[0].startswith('@'):
+            content = ' '.join(g['stuff'].split()[1:])
+            t.direct_messages.new(
+                screen_name=user[1:],
+                text=content
+            )
+            printNicely(green('Message sent.'))
+        else:
+            printNicely(red('A name should begin with a \'@\''))
+    except:
+        debug_option()
+        printNicely(red('Sorry I can\'t understand.'))
 
 
 def trash():
@@ -630,22 +639,47 @@ def trash():
     printNicely(green('Message deleted.'))
 
 
-def whois():
+def ls():
     """
-    Show profile of a specific user
+    List friends for followers
     """
     t = Twitter(auth=authen())
-    screen_name = g['stuff'].split()[0]
-    if screen_name.startswith('@'):
-        try:
-            user = t.users.show(
-                screen_name=screen_name[1:],
-                include_entities=False)
-            show_profile(user)
-        except:
-            printNicely(red('Omg no user.'))
-    else:
-        printNicely(red('A name should begin with a \'@\''))
+    # Get name
+    try:
+        name = g['stuff'].split()[1]
+        if name.startswith('@'):
+            name = name[1:]
+        else:
+            printNicely(red('A name should begin with a \'@\''))
+            raise Exception('Invalid name')
+    except:
+        name = g['original_name']
+    # Get list followers or friends
+    try:
+        target = g['stuff'].split()[0]
+    except:
+        printNicely(red('Omg some syntax is wrong.'))
+    # Init cursor
+    d = {'fl': 'followers', 'fr': 'friends'}
+    next_cursor = -1
+    rel = {}
+    # Cursor loop
+    while next_cursor != 0:
+        list = getattr(t, d[target]).list(
+            screen_name=name,
+            cursor=next_cursor,
+            skip_status=True,
+            include_entities=False,
+        )
+        for u in list['users']:
+            rel[u['name']] = '@' + u['screen_name']
+        next_cursor = list['next_cursor']
+    # Print out result
+    printNicely('All: ' + str(len(rel)) + ' ' + d[target] + '.')
+    for name in rel:
+        user = '  ' + cycle_color(name)
+        user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
+        printNicely(user)
 
 
 def follow():
@@ -696,6 +730,7 @@ def mute():
             else:
                 printNicely(red(rel))
         except:
+            debug_option()
             printNicely(red('Something is wrong, can not mute now :('))
     else:
         printNicely(red('A name should begin with a \'@\''))
@@ -894,6 +929,7 @@ def list_add(t):
             screen_name=user_name)
         printNicely(green('Added.'))
     except:
+        debug_option()
         printNicely(light_magenta('I\'m sorry we can not add him/her.'))
 
 
@@ -913,6 +949,7 @@ def list_remove(t):
             screen_name=user_name)
         printNicely(green('Gone.'))
     except:
+        debug_option()
         printNicely(light_magenta('I\'m sorry we can not remove him/her.'))
 
 
@@ -928,6 +965,7 @@ def list_subscribe(t):
             owner_screen_name=owner)
         printNicely(green('Done.'))
     except:
+        debug_option()
         printNicely(
             light_magenta('I\'m sorry you can not subscribe to this list.'))
 
@@ -944,6 +982,7 @@ def list_unsubscribe(t):
             owner_screen_name=owner)
         printNicely(green('Done.'))
     except:
+        debug_option()
         printNicely(
             light_magenta('I\'m sorry you can not unsubscribe to this list.'))
 
@@ -980,6 +1019,7 @@ def list_new(t):
             description=description)
         printNicely(green(name + ' list is created.'))
     except:
+        debug_option()
         printNicely(red('Oops something is wrong with Twitter :('))
 
 
@@ -1007,6 +1047,7 @@ def list_update(t):
                 description=description)
         printNicely(green(slug + ' list is updated.'))
     except:
+        debug_option()
         printNicely(red('Oops something is wrong with Twitter :('))
 
 
@@ -1014,13 +1055,14 @@ def list_delete(t):
     """
     Delete a list
     """
-    slug = raw_input(light_magenta('Your list that you want to update: '))
+    slug = raw_input(light_magenta('Your list that you want to delete: '))
     try:
         t.lists.destroy(
             slug='-'.join(slug.split()),
             owner_screen_name=g['original_name'])
         printNicely(green(slug + ' list is deleted.'))
     except:
+        debug_option()
         printNicely(red('Oops something is wrong with Twitter :('))
 
 
@@ -1055,6 +1097,67 @@ def twitterlist():
         printNicely(red('Please try again.'))
 
 
+def switch():
+    """
+    Switch stream
+    """
+    try:
+        target = g['stuff'].split()[0]
+        # Filter and ignore
+        args = parse_arguments()
+        try:
+            if g['stuff'].split()[-1] == '-f':
+                guide = 'To ignore an option, just hit Enter key.'
+                printNicely(light_magenta(guide))
+                only = raw_input('Only nicks [Ex: @xxx,@yy]: ')
+                ignore = raw_input('Ignore nicks [Ex: @xxx,@yy]: ')
+                args.filter = filter(None, only.split(','))
+                args.ignore = filter(None, ignore.split(','))
+            elif g['stuff'].split()[-1] == '-d':
+                args.filter = c['ONLY_LIST']
+                args.ignore = c['IGNORE_LIST']
+        except:
+            printNicely(red('Sorry, wrong format.'))
+            return
+        # Public stream
+        if target == 'public':
+            keyword = g['stuff'].split()[1]
+            if keyword[0] == '#':
+                keyword = keyword[1:]
+            # Kill old thread
+            g['stream_stop'] = True
+            args.track_keywords = keyword
+            # Start new thread
+            th = threading.Thread(
+                target=stream,
+                args=(
+                    c['PUBLIC_DOMAIN'],
+                    args))
+            th.daemon = True
+            th.start()
+        # Personal stream
+        elif target == 'mine':
+            # Kill old thread
+            g['stream_stop'] = True
+            # Start new thread
+            th = threading.Thread(
+                target=stream,
+                args=(
+                    c['USER_DOMAIN'],
+                    args,
+                    g['original_name']))
+            th.daemon = True
+            th.start()
+        printNicely('')
+        if args.filter:
+            printNicely(cyan('Only: ' + str(args.filter)))
+        if args.ignore:
+            printNicely(red('Ignore: ' + str(args.ignore)))
+        printNicely('')
+    except:
+        printNicely(red('Sorry I can\'t understand.'))
+
+
 def cal():
     """
     Unix's command `cal`
@@ -1066,6 +1169,33 @@ def cal():
     show_calendar(month, date, rel)
 
 
+def theme():
+    """
+    List and change theme
+    """
+    if not g['stuff']:
+        # List themes
+        for theme in g['themes']:
+            line = light_magenta(theme)
+            if c['THEME'] == theme:
+                line = ' ' * 2 + light_yellow('* ') + line
+            else:
+                line = ' ' * 4 + line
+            printNicely(line)
+    else:
+        # Change theme
+        try:
+            # Load new theme
+            c['THEME'] = reload_theme(g['stuff'], c['THEME'])
+            # Redefine decorated_name
+            g['decorated_name'] = lambda x: color_func(
+                c['DECORATED_NAME'])(
+                '[' + x + ']: ')
+            printNicely(green('Theme changed.'))
+        except:
+            printNicely(red('No such theme exists.'))
+
+
 def config():
     """
     Browse and change config
@@ -1130,33 +1260,6 @@ def config():
         printNicely(light_magenta('Sorry I can\'s understand.'))
 
 
-def theme():
-    """
-    List and change theme
-    """
-    if not g['stuff']:
-        # List themes
-        for theme in g['themes']:
-            line = light_magenta(theme)
-            if c['THEME'] == theme:
-                line = ' ' * 2 + light_yellow('* ') + line
-            else:
-                line = ' ' * 4 + line
-            printNicely(line)
-    else:
-        # Change theme
-        try:
-            # Load new theme
-            c['THEME'] = reload_theme(g['stuff'], c['THEME'])
-            # Redefine decorated_name
-            g['decorated_name'] = lambda x: color_func(
-                c['DECORATED_NAME'])(
-                '[' + x + ']: ')
-            printNicely(green('Theme changed.'))
-        except:
-            printNicely(red('No such theme exists.'))
-
-
 def help_discover():
     """
     Discover the world
@@ -1170,6 +1273,8 @@ def help_discover():
         light_green('trend JP Tokyo') + '.\n'
     usage += s * 2 + light_green('home') + ' will show your timeline. ' + \
         light_green('home 7') + ' will show 7 tweets.\n'
+    usage += s * 2 + \
+        light_green('notification') + ' will show your recent notification.\n'
     usage += s * 2 + light_green('mentions') + ' will show mentions timeline. ' + \
         light_green('mentions 7') + ' will show 7 mention tweets.\n'
     usage += s * 2 + light_green('whois @mdo') + ' will show profile  of ' + \
@@ -1202,6 +1307,8 @@ def help_tweets():
     usage += s * 2 + \
         light_green('allrt 12 20 ') + ' will list 20 newest retweet of the tweet with ' + \
         light_yellow('[id=12]') + '.\n'
+    usage += s * 2 + light_green('conversation 12') + ' will show the chain of ' + \
+        'replies prior to the tweet with ' + light_yellow('[id=12]') + '.\n'
     usage += s * 2 + light_green('rep 12 oops') + ' will reply "' + \
         light_yellow('oops') + '" to tweet with ' + \
         light_yellow('[id=12]') + '.\n'
@@ -1231,8 +1338,8 @@ def help_messages():
     usage += s + grey(u'\u266A' + ' Direct messages \n')
     usage += s * 2 + light_green('inbox') + ' will show inbox messages. ' + \
         light_green('inbox 7') + ' will show newest 7 messages.\n'
-    usage += s * 2 + light_green('sent') + ' will show sent messages. ' + \
-        light_green('sent 7') + ' will show newest 7 messages.\n'
+    usage += s * 2 + light_green('thread 2') + ' will show full thread with ' + \
+        light_yellow('[thread_id=2]') + '.\n'
     usage += s * 2 + light_green('mes @dtvd88 hi') + ' will send a "hi" messege to ' + \
         magenta('@dtvd88') + '.\n'
     usage += s * 2 + light_green('trash 5') + ' will remove message with ' + \
@@ -1424,7 +1531,7 @@ def pause():
     """
     Pause stream display
     """
-    c['pause'] = True
+    g['pause'] = True
     printNicely(green('Stream is paused'))
 
 
@@ -1432,7 +1539,7 @@ def replay():
     """
     Replay stream
     """
-    c['pause'] = False
+    g['pause'] = False
     printNicely(green('Stream is running back now'))
 
 
@@ -1477,12 +1584,14 @@ cmdset = [
     'switch',
     'trend',
     'home',
+    'notification',
     'view',
     'mentions',
     't',
     'rt',
     'quote',
     'allrt',
+    'conversation',
     'fav',
     'rep',
     'del',
@@ -1493,7 +1602,7 @@ cmdset = [
     'open',
     'ls',
     'inbox',
-    'sent',
+    'thread',
     'trash',
     'whois',
     'fl',
@@ -1520,12 +1629,14 @@ funcset = [
     switch,
     trend,
     home,
+    notification,
     view,
     mentions,
     tweet,
     retweet,
     quote,
     allretweet,
+    conversation,
     favorite,
     reply,
     delete,
@@ -1536,7 +1647,7 @@ funcset = [
     urlopen,
     ls,
     inbox,
-    sent,
+    thread,
     trash,
     whois,
     follow,
@@ -1576,12 +1687,14 @@ def listen():
             ['public', 'mine'],  # switch
             [],  # trend
             [],  # home
+            [],  # notification
             ['@'],  # view
             [],  # mentions
             [],  # tweet
             [],  # retweet
             [],  # quote
             [],  # allretweet
+            [],  # conversation
             [],  # favorite
             [],  # reply
             [],  # delete
@@ -1592,7 +1705,7 @@ def listen():
             [''],  # open url
             ['fl', 'fr'],  # list
             [],  # inbox
-            [],  # sent
+            [i for i in g['message_threads']],  # sent
             [],  # trash
             ['@'],  # whois
             ['@'],  # follow
@@ -1637,19 +1750,20 @@ def listen():
     read_history()
     reset()
     while True:
-        # raw_input
-        if g['prefix']:
-            line = raw_input(g['decorated_name'](c['PREFIX']))
-        else:
-            line = raw_input()
-        # Save cmd to compare with readline buffer
-        g['cmd'] = line.strip()
-        # Get short cmd to pass to handle function
-        try:
-            cmd = line.split()[0]
-        except:
-            cmd = ''
         try:
+            # raw_input
+            if g['prefix']:
+                # Only use PREFIX as a string with raw_input
+                line = raw_input(g['decorated_name'](g['PREFIX']))
+            else:
+                line = raw_input()
+            # Save cmd to compare with readline buffer
+            g['cmd'] = line.strip()
+            # Get short cmd to pass to handle function
+            try:
+                cmd = line.split()[0]
+            except:
+                cmd = ''
             # Lock the semaphore
             c['lock'] = True
             # Save cmd to global variable and call process
@@ -1663,7 +1777,10 @@ def listen():
                 g['prefix'] = True
             # Release the semaphore lock
             c['lock'] = False
+        except EOFError:
+            printNicely('')
         except Exception:
+            debug_option()
             printNicely(red('OMG something is wrong with Twitter right now.'))
 
 
@@ -1729,10 +1846,16 @@ def stream(domain, args, name='Rainbow Stream'):
             elif tweet is Hangup:
                 printNicely("-- Hangup --")
             elif tweet.get('text'):
+                # Check the semaphore pause and lock (stream process only)
+                if g['pause']:
+                    continue
+                while c['lock']:
+                    time.sleep(0.5)
+                # Draw the tweet
                 draw(
                     t=tweet,
                     keyword=args.track_keywords,
-                    check_semaphore=True,
+                    humanize=False,
                     fil=args.filter,
                     ig=args.ignore,
                 )
@@ -1750,7 +1873,15 @@ def stream(domain, args, name='Rainbow Stream'):
                     sys.stdout.write(g['decorated_name'](c['PREFIX']))
                     sys.stdout.flush()
             elif tweet.get('direct_message'):
-                print_message(tweet['direct_message'], check_semaphore=True)
+                # Check the semaphore pause and lock (stream process only)
+                if g['pause']:
+                    continue
+                while c['lock']:
+                    time.sleep(0.5)
+                print_message(tweet['direct_message'])
+            elif tweet.get('event'):
+                g['events'].append(tweet)
+                print_event(tweet)
     except TwitterHTTPError:
         printNicely('')
         printNicely(