Merge branch 'master' of github.com:DTVD/rainbowstream

[rainbowstream.git] / rainbowstream / rainbow.py

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 73af665e36d90a556af91d3fdbdb98cf94925b2d..754b129844db3f561a3df7c88c9a76cc6762034e 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -524,8 +524,8 @@ def help():
         yellow('[id=12]') + '.\n'
     usage += s * 2 + green('s #AKB48') + ' will search for "' + \
         yellow('AKB48') + '" and return 5 newest tweet.\n'
-    usage += s * 2 + green('show image 12') + ' will show image in ' + \
-        yellow('[id=12]') + 'in your OS\'s image viewer.\n'
+    usage += s * 2 + green('show image 12') + ' will show image in tweet with ' + \
+        yellow('[id=12]') + ' in your OS\'s image viewer.\n'
     usage += s * 2 + green('fl @dtvd88') + ' will follow ' + \
         yellow('@dtvd88') + '.\n'
     usage += s * 2 + green('ufl @dtvd88') + ' will unfollow ' + \
@@ -599,7 +599,7 @@ def listen():
     d = dict(zip(
         cmdset,
         [
-            ['public #', 'mine'],  # switch
+            ['public', 'mine'],  # switch
             [],  # home
             ['@'],  # view
             [],  # tweet
@@ -610,8 +610,8 @@ def listen():
             [],  # unfavorite
             ['#'],  # search
             ['image'],  # show image
-            [],  # follow
-            [],  # unfollow
+            ['@'],  # follow
+            ['@'],  # unfollow
             [],  # help
             [],  # clear
             [],  # quit