include dm in timeline

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 55e062cb5b0a5c38243dabbe54048cb6513c1c42..4c2851f754a93a78fb3f11e151bb0a91293d228b 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -165,8 +165,10 @@ def switch():
         args = parse_arguments()
         try:
             if g['stuff'].split()[-1] == '-f':
-                only = raw_input('Only nicks: ')
-                ignore = raw_input('Ignore nicks: ')
+                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':
@@ -1652,6 +1654,8 @@ def stream(domain, args, name='Rainbow Stream'):
                     fil=args.filter,
                     ig=args.ignore,
                 )
+            elif tweet.get('direct_message'):
+                print_message(tweet['direct_message'])
     except TwitterHTTPError:
         printNicely('')
         printNicely(

diff --git a/setup.py b/setup.py
index 06883651c6280d6386453863a1f76697ddfc46f1..c781b211c94abe700fe5cc046d7e7215d92495e0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import os, sys
 
 # Bumped version
-version = '0.4.2'
+version = '0.4.3'
 
 # Require
 install_requires = [