X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=a7007ccee7aeb02de7398bc9f80398a0ec14f9c4;hp=27d7ef1eb24c8b3e868846c8300ad7272969023e;hb=fc8a8377264a4925033bb8583e04a8a134b3d424;hpb=e6f075192ca3e2490503a7553d2f72f7a388b51d diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index 27d7ef1..a7007cc 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -245,6 +245,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())) @@ -322,6 +323,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 @@ -331,8 +353,7 @@ def home(): if g['stuff'].isdigit(): num = int(g['stuff']) kwargs = {'count': num} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) for tweet in reversed(t.statuses.home_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -359,8 +380,7 @@ def mentions(): if g['stuff'].isdigit(): num = int(g['stuff']) kwargs = {'count': num} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) for tweet in reversed(t.statuses.mentions_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -405,8 +425,7 @@ def view(): except: num = c['HOME_TWEET_NUM'] kwargs = {'count': num, 'screen_name': user[1:]} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) for tweet in reversed(t.statuses.user_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -424,8 +443,7 @@ def view_my_tweets(): except: num = c['HOME_TWEET_NUM'] kwargs = {'count': num, 'screen_name': g['original_name']} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) for tweet in reversed( t.statuses.user_timeline(**kwargs)): draw(t=tweet) @@ -452,8 +470,7 @@ def search(): 'type': type, 'count': count, } - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) # Perform search rel = t.search.tweets(**kwargs)['statuses'] # Return results @@ -550,8 +567,7 @@ def quote(): return tid = c['tweet_dict'][id] kwargs = {'id': tid} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) tweet = t.statuses.show(**kwargs) # Get formater formater = format_quote(tweet) @@ -587,8 +603,7 @@ def allretweet(): num = c['RETWEETS_SHOW_NUM'] # Get result and display kwargs = {'id': tid, 'count': num} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) rt_ary = t.statuses.retweets(**kwargs) if not rt_ary: printNicely(magenta('This tweet has no retweet.')) @@ -610,8 +625,7 @@ def conversation(): return tid = c['tweet_dict'][id] kwargs = {'id': tid} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) tweet = t.statuses.show(**kwargs) limit = c['CONVERSATION_MAX'] thread_ref = [] @@ -688,8 +702,7 @@ def favorite(): t.favorites.create(_id=tid, include_entities=False) printNicely(green('Favorited.')) kwargs = {'id': tid} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) draw(t.statuses.show(**kwargs)) printNicely('') @@ -708,8 +721,7 @@ def unfavorite(): t.favorites.destroy(_id=tid) printNicely(green('Okay it\'s unfavorited.')) kwargs = {'id': tid} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) draw(t.statuses.show(**kwargs)) printNicely('') @@ -726,8 +738,7 @@ def share(): printNicely(red('Tweet id is not valid.')) return kwargs = {'id': tid} - if not c.get('DISABLE_EXTENDED_TWEETS'): - kwargs['tweet_mode'] = 'extended' + kwargs = add_tweetmode_parameter(kwargs) tweet = t.statuses.show(**kwargs) url = 'https://twitter.com/' + \ tweet['user']['screen_name'] + '/status/' + str(tid) @@ -807,52 +818,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]] @@ -1499,7 +1494,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.')) @@ -1562,7 +1557,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'], @@ -2167,98 +2162,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): """