view timeline, reply, delete

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 684aa8ef6ad2173a5f1c2f56d38a28b688221c50..c1fb60e1e3ad318ac5bb011efdf4e82cc8977ae8 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -40,7 +40,7 @@ def draw(t, keyword=None):
 
     # Format info
     user = cycle_color(name) + grey(' ' + '@' + screen_name + ' ')
-    meta = grey('[' + time + '] ['+ str(tid) +']')
+    meta = grey('[' + time + '] [id=' + str(tid) + ']')
     tweet = text.split()
     # Highlight RT
     tweet = map(lambda x: grey(x) if x == 'RT' else x, tweet)
@@ -68,7 +68,6 @@ def draw(t, keyword=None):
         cw=len(meta) + 2,
     )
     line3 = '  ' + tweet
-    line4 = ''
 
     printNicely(line1)
     printNicely(line2)
@@ -104,7 +103,7 @@ def parse_arguments():
 
 def authen():
     """
-    authenticate with Twitter OAuth
+    Authenticate with Twitter OAuth
     """
     # When using rainbow stream you must authorize.
     twitter_credential = os.environ.get(
@@ -134,29 +133,71 @@ def get_decorated_name():
     g['decorated_name'] = grey('[') + grey(name) + grey(']: ')
 
 
+def home():
+    """
+    Home
+    """
+    t = Twitter(auth=authen())
+    count = HOME_TWEET_NUM
+    if g['stuff'].isdigit():
+        count = g['stuff']
+    for tweet in reversed(t.statuses.home_timeline(count=count)):
+        draw(t=tweet)
+
+
+def view():
+    """
+    Friend view
+    """
+    t = Twitter(auth=authen())
+    user = g['stuff'].split()[0]
+    try:
+        count = int(g['stuff'].split()[1])
+    except:
+        count = HOME_TWEET_NUM
+    for tweet in reversed(t.statuses.user_timeline(count=count, screen_name=user)):
+        draw(t=tweet)
+
+
 def tweet():
     """
-    Authen and tweet
+    Tweet
     """
     t = Twitter(auth=authen())
     t.statuses.update(status=g['stuff'])
 
 
-def timeline():
+def reply():
     """
-    Authen and get timeline
+    Reply
     """
     t = Twitter(auth=authen())
-    count = HOME_TWEET_NUM
-    if g['stuff'].isdigit():
-        count = g['stuff']
-    for tweet in reversed(t.statuses.home_timeline(count=count)):
-        draw(t=tweet)
+    try:
+        id = int(g['stuff'].split()[0])
+        user = t.statuses.show(id=id)['user']['screen_name']
+        status = ' '.join(g['stuff'].split()[1:])
+        status = '@' + user + ' ' + status.decode('utf-8')
+        t.statuses.update(status=status, in_reply_to_status_id=id)
+    except:
+        print(red('Sorry I can\'t understand.'))
+
+
+def delete():
+    """
+    Delete
+    """
+    t = Twitter(auth=authen())
+    try:
+        id = int(g['stuff'].split()[0])
+        t.statuses.destroy(id=id)
+        print(green('Okay it\'s gone.'))
+    except:
+        print(red('Sorry I can\'t delete this tweet for you.'))
 
 
 def search():
     """
-    Authen and search
+    Search
     """
     t = Twitter(auth=authen())
     rel = t.search.tweets(q='#' + g['stuff'])['statuses']
@@ -197,14 +238,17 @@ def follower():
 
 def help():
     """
-    Print help
+    Help
     """
     usage = '''
     Hi boss! I'm ready to serve you right now!
     ----------------------------------------------------
-    "t" at the beginning will tweet immediately
-    "tl" at the beginning will tweet immediately
-    "s" and follow by any word will search and return 5 newest tweet
+    "home" will show your timeline. "home 7" will print 7 tweet.
+    "view bob" will show your friend @bob's home.
+    "t oops" will tweet "oops" immediately.
+    "rep 12345 oops" will reply "oops" to tweet with id "12345" .
+    "del 12345" will delete tweet with id "12345".
+    "s AKB48" will search for "AKB48" and return 5 newest tweet
     "fr" will list out your following people
     "fl" will list out your followers
     "h" or "help" will print this help once again
@@ -219,7 +263,7 @@ def help():
 
 def clear():
     """
-    Exit all
+    Clear screen
     """
     os.system('clear')
 
@@ -234,18 +278,21 @@ def quit():
 
 def process(cmd):
     """
-    Process switch by start of line
+    Process switch
     """
     return {
-        't'    : tweet,
-        'tl'   : timeline,
-        's'    : search,
-        'fr'   : friend,
-        'fl'   : follower,
-        'h'    : help,
-        'help' : help,
-        'c'    : clear,
-        'q'    : quit,
+        'home': home,
+        'view': view,
+        't': tweet,
+        'rep': reply,
+        'del': delete,
+        's': search,
+        'fr': friend,
+        'fl': follower,
+        'h': help,
+        'help': help,
+        'c': clear,
+        'q': quit,
     }.get(cmd, lambda: sys.stdout.write(g['decorated_name']))
 
 

diff --git a/setup.py b/setup.py
index 28ebdf31f4c25ad5c48592d17982a1a1b687ccf2..bf81013802c1d39bcd010bf25848dd642cc47e9b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ install_requires = [
     "python-dateutil",
     "termcolor",
     "twitter"
-    ]
+]
 
 setup(name='rainbowstream',
       version=version,
@@ -28,12 +28,12 @@ setup(name='rainbowstream',
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
           "Topic :: Utilities",
           "License :: OSI Approved :: MIT License",
-          ],
+      ],
       keywords='twitter, command-line tools, web 2.0, stream API',
       author='Vu Nhat Minh',
       author_email='nhatminh_179@hotmail.com',
       url='https://github.com/DTVD/rainbowstream',
-      download_url = 'https://github.com/DTVD/rainbowstream/tarball/0.0.1',
+      download_url='https://github.com/DTVD/rainbowstream/tarball/0.0.1',
       license='MIT License',
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
@@ -42,6 +42,6 @@ setup(name='rainbowstream',
       entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
-      rainbowstream=rainbowstream.rainbow:fly
+      rainbow=rainbowstream.rainbow:fly
       """,
       )