From: Andrew W. Donoho <redacted>
Date: Fri, 17 Jan 2014 20:53:36 +0000 (-0600)
Subject: Add support for both user and site streams.
X-Git-Tag: twitter-1.11.0~3^2~2^2~2
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/7333aa5a9796c2df8932d0fc1f72a1c9ca4e7726

Add support for both user and site streams.
---

diff --git a/twitter/stream_example.py b/twitter/stream_example.py
index d90a424..5f2dbdf 100644
--- a/twitter/stream_example.py
+++ b/twitter/stream_example.py
@@ -25,6 +25,8 @@ def parse_arguments():
     parser.add_argument('-ts', '--token_secret', help='The Twitter Access Token Secret.')
     parser.add_argument('-ck', '--consumer_key', help='The Twitter Consumer Key.')
     parser.add_argument('-cs', '--consumer_secret', help='The Twitter Consumer Secret.')
+    parser.add_argument('-us', '--user_stream', action='store_true', help='Connect to the user stream endpoint.')
+    parser.add_argument('-ss', '--site_stream', action='store_true', help='Connect to the site stream endpoint.')
 
     return parser.parse_args()
 
@@ -36,10 +38,18 @@ def main():
     args = parse_arguments()
 
     # When using twitter stream you must authorize.
-    stream = TwitterStream(auth=OAuth(args.token, args.token_secret, args.consumer_key, args.consumer_secret))
+    auth = OAuth(args.token, args.token_secret, args.consumer_key, args.consumer_secret)
+    if args.user_stream:
+        stream = TwitterStream(auth=auth, domain='userstream.twitter.com')
+        tweet_iter = stream.user()
+    elif args.site_stream:
+        stream = TwitterStream(auth=auth, domain='sitestream.twitter.com')
+        tweet_iter = stream.site()
+    else:
+        stream = TwitterStream(auth=auth)
+        tweet_iter = stream.statuses.sample()
 
     # Iterate over the sample stream.
-    tweet_iter = stream.statuses.sample()
     for tweet in tweet_iter:
         # You must test that your tweet has text. It might be a delete
         # or data message.