Merge pull request #258 from jimdoescode/alternate_oauth
authororakaro.targaryen <orakaro@users.noreply.github.com>
Tue, 26 Nov 2019 14:11:20 +0000 (23:11 +0900)
committerGitHub <noreply@github.com>
Tue, 26 Nov 2019 14:11:20 +0000 (23:11 +0900)
Allow specifying the location of oauth files

README.rst
docs/conf.py
rainbowstream/draw.py
rainbowstream/rainbow.py
setup.py

index 5b1924e..41d418b 100644 (file)
@@ -1,3 +1,10 @@
+A Note about Twitter API Change
+-------------------------------
+
+Heads-up! As Twitter **discontinues supporting** Stream API, RainbowStream's stream function has been stopped working for a long time. But here is a good new, from version 1.5.0 we **switched to a Polling Strategy** that using the `home` command to check for every 90 seconds. Notes that rate limit for `home` command itself is 15 times per 15 minutes, so don't abuse it too much to leave space for the polling stream :)
+
+If you are interested in detail: https://github.com/orakaro/rainbowstream/issues/271
+
 Rainbow Stream
 --------------
 
@@ -15,7 +22,7 @@ on Python (2.7.x and 3.x).
 
 Home page: https://github.com/orakaro/rainbowstream
 
-Source code: https://github.com/DTVD/rainbowstream
+Source code: https://github.com/orakaro/rainbowstream
 
 Showcase
 --------
index e06cbb0..ad3c576 100644 (file)
@@ -48,9 +48,9 @@ copyright = u'2014, Vu Nhat Minh'
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.7'
+version = '1.5.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.7'
+release = '1.5.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
index 62254e6..2fcdeb4 100644 (file)
@@ -425,7 +425,7 @@ def print_thread(partner, me_nick, me_name):
     """
     # Sort messages by time
     messages = dg['thread'][partner]
-    messages.sort(key=lambda x: parser.parse(x['created_at']))
+    messages.sort(key=lambda x: int(x['created_at']))
     # Use legacy display on non-ascii text message
     ms = [m['text'] for m in messages]
     ums = [m for m in ms if not all(ord(c) < 128 for c in m)]
@@ -487,8 +487,7 @@ def print_right_message(m):
         printNicely(screen_line)
     printNicely(dotline)
     # Format clock
-    date = parser.parse(m['created_at'])
-    date = arrow.get(date).to('local').datetime
+    date = arrow.get(int(m['created_at'])/1000).to('local').datetime # Read Unixtime in miliseconds
     clock_format = '%Y/%m/%d %H:%M:%S'
     try:
         clock_format = c['FORMAT']['MESSAGE']['CLOCK_FORMAT']
@@ -597,10 +596,10 @@ def print_message(m):
     """
     # Retrieve message
     sender_screen_name = '@' + m['sender_screen_name']
-    sender_name = m['sender']['name']
+    sender_name = m['sender_name']
     text = unescape(m['text'])
     recipient_screen_name = '@' + m['recipient_screen_name']
-    recipient_name = m['recipient']['name']
+    recipient_name = m['recipient_name']
     mid = m['id']
     date = parser.parse(m['created_at'])
     date = arrow.get(date).to('local').datetime
index 187fc45..e0c86aa 100644 (file)
@@ -249,6 +249,7 @@ def init(args):
     credential = t.account.verify_credentials()
     screen_name = '@' + credential['screen_name']
     name = credential['name']
+    g['id_str'] = credential['id_str']
     c['original_name'] = g['original_name'] = screen_name[1:]
     g['listname'] = g['keyword'] = ''
     g['PREFIX'] = u2str(emojize(format_prefix()))
@@ -326,6 +327,27 @@ def trend():
                     print_trends(trends)
 
 
+def poll():
+    """
+    Fetch stream based on since_id
+    """
+    t = Twitter(auth=authen())
+
+    num = c['HOME_TWEET_NUM']
+    kwargs = {'count': num}
+
+    if 'since_id' in g:
+        kwargs['since_id'] = g['since_id']
+
+    kwargs = add_tweetmode_parameter(kwargs)
+    result = t.statuses.home_timeline(**kwargs)
+    if result:
+        g['since_id'] = result[0]['id']
+    for tweet in reversed(result):
+        draw(t=tweet)
+    if result:
+        printNicely('')
+
 def home():
     """
     Home
@@ -458,7 +480,7 @@ def search():
     # Return results
     if rel:
         printNicely('Newest tweets:')
-        for i in reversed(xrange(count)):
+        for i in reversed(xrange(min(len(rel), count))):
             draw(t=rel[i], keyword=query)
         printNicely('')
     else:
@@ -800,52 +822,36 @@ def inbox():
     num = c['MESSAGES_DISPLAY']
     if g['stuff'].isdigit():
         num = g['stuff']
+
+    def inboxFilter(message):
+        return message['message_create']['sender_id'] == g['id_str']
+    def sentFilter(message):
+        return message['message_create']['target']['recipient_id'] == g['id_str']
+
+    def map_message(message):
+        message_create = message['message_create']
+        sender = t.users.show(id=int(message_create['sender_id']),include_entities=False)
+        recipient = t.users.show(id=int(message_create['target']['recipient_id']),include_entities=False)
+        message['sender_screen_name'] = sender['screen_name']
+        message['sender_name'] = sender['name']
+        message['recipient_screen_name'] = recipient['screen_name']
+        message['recipient_name'] = recipient['name']
+        message['text'] = message['message_create']['message_data']['text']
+        message['created_at'] = message['created_timestamp']
+        return message
+
     # Get inbox messages
-    cur_page = 1
-    inbox = []
-    while num > 20:
-        inbox = inbox + t.direct_messages(
-            count=20,
-            page=cur_page,
-            include_entities=False,
-            skip_status=False
-        )
-        num -= 20
-        cur_page += 1
-    inbox = inbox + t.direct_messages(
-        count=num,
-        page=cur_page,
-        include_entities=False,
-        skip_status=False
-    )
-    # Get sent messages
-    num = c['MESSAGES_DISPLAY']
-    if g['stuff'].isdigit():
-        num = g['stuff']
-    cur_page = 1
-    sent = []
-    while num > 20:
-        sent = sent + t.direct_messages.sent(
-            count=20,
-            page=cur_page,
-            include_entities=False,
-            skip_status=False
-        )
-        num -= 20
-        cur_page += 1
-    sent = sent + t.direct_messages.sent(
-        count=num,
-        page=cur_page,
-        include_entities=False,
-        skip_status=False
-    )
+    messages = t.direct_messages.events.list()['events']
+    messages = list(map(map_message, messages))
+    inbox = list(filter(inboxFilter, messages))
+    sent = list(filter(sentFilter, messages))
 
     d = {}
     uniq_inbox = list(set(
-        [(m['sender_screen_name'], m['sender']['name']) for m in inbox]
+        [(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]
+        [(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]]
@@ -1492,7 +1498,7 @@ def theme():
             # Redefine decorated_name
             g['decorated_name'] = lambda x: color_func(
                 c['DECORATED_NAME'])(
-                '[' + x + ']: ')
+                '[' + x + ']: ', rl=True)
             printNicely(green('Theme changed.'))
         except:
             printNicely(red('No such theme exists.'))
@@ -1555,7 +1561,7 @@ def config():
             if key == 'THEME':
                 c['THEME'] = reload_theme(value, c['THEME'])
                 g['decorated_name'] = lambda x: color_func(
-                    c['DECORATED_NAME'])('[' + x + ']: ')
+                    c['DECORATED_NAME'])('[' + x + ']: ', rl=True)
             elif key == 'PREFIX':
                 g['PREFIX'] = u2str(emojize(format_prefix(
                     listname=g['listname'],
@@ -2160,98 +2166,11 @@ def stream(domain, args, name='Rainbow Stream'):
     query_args = dict()
     if args.track_keywords:
         query_args['track'] = args.track_keywords
-    # Get stream
-    stream = TwitterStream(
-        auth=authen(),
-        domain=domain,
-        **stream_args)
-    try:
-        if domain == c['USER_DOMAIN']:
-            tweet_iter = stream.user(**query_args)
-        elif domain == c['SITE_DOMAIN']:
-            tweet_iter = stream.site(**query_args)
-        else:
-            if args.track_keywords:
-                tweet_iter = stream.statuses.filter(**query_args)
-            else:
-                tweet_iter = stream.statuses.sample()
-        # Block new stream until other one exits
-        StreamLock.acquire()
-        g['stream_stop'] = False
-        last_tweet_time = time.time()
-        for tweet in tweet_iter:
-            if tweet is None:
-                printNicely('-- None --')
-            elif tweet is Timeout:
-                # Because the stream check for each 0.3s
-                # so we shouldn't output anything here
-                if(g['stream_stop']):
-                    StreamLock.release()
-                    break
-            elif tweet is HeartbeatTimeout:
-                printNicely('-- Heartbeat Timeout --')
-                reconn_notice()
-                StreamLock.release()
-                break
-            elif tweet is Hangup:
-                printNicely('-- Hangup --')
-                reconn_notice()
-                StreamLock.release()
-                break
-            elif tweet.get('text'):
-                # Slow down the stream by STREAM_DELAY config key
-                if time.time() - last_tweet_time < c['STREAM_DELAY']:
-                    continue
-                last_tweet_time = time.time()
-                # 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,
-                    humanize=False,
-                    fil=args.filter,
-                    ig=args.ignore,
-                )
-                # Current readline buffer
-                current_buffer = readline.get_line_buffer().strip()
-                # There is an unexpected behaviour in MacOSX readline + Python 2:
-                # after completely delete a word after typing it,
-                # somehow readline buffer still contains
-                # the 1st character of that word
-                if current_buffer and g['cmd'] != current_buffer:
-                    sys.stdout.write(
-                        g['decorated_name'](g['PREFIX']) + current_buffer)
-                    sys.stdout.flush()
-                elif not c['HIDE_PROMPT']:
-                    sys.stdout.write(g['decorated_name'](g['PREFIX']))
-                    sys.stdout.flush()
-            elif tweet.get('direct_message'):
-                # 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'):
-                c['events'].append(tweet)
-                print_event(tweet)
-    except TwitterHTTPError as e:
-        printNicely('')
-        printNicely(
-            magenta('We have connection problem with twitter stream API right now :('))
-        detail_twitter_error(e)
-        sys.stdout.write(g['decorated_name'](g['PREFIX']))
-        sys.stdout.flush()
-    except (URLError):
-        printNicely(
-            magenta('There seems to be a connection problem.'))
-        save_history()
-        sys.exit()
 
+    polling_time = 90
+    while True:
+        time.sleep(polling_time)
+        poll()
 
 def spawn_public_stream(args, keyword=None):
     """
index 872dce1..6518e30 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -9,13 +9,13 @@ else:
     from shlex import quote
 
 # Bumped version
-version = '1.3.7'
+version = '1.5.1'
 
 # Require
 install_requires = [
     "python-dateutil",
     "arrow",
-    "requests==2.5.3",
+    "requests",
     "pyfiglet",
     "twitter",
     "Pillow",
@@ -53,6 +53,8 @@ setup(name='rainbowstream',
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: 3.7",
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
           "Topic :: Utilities",
           "License :: OSI Approved :: MIT License",
@@ -66,6 +68,7 @@ setup(name='rainbowstream',
       include_package_data=True,
       zip_safe=True,
       install_requires=install_requires,
+      long_description_content_type='text/markdown',
       entry_points="""
       # -*- Entry points: -*-
       [console_scripts]