X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=f1db50dec3144f7b8f2ddfb640da9fa05a356597;hp=e0668c32522506195414415a551030659f1a56fb;hb=HEAD;hpb=787643bddacce47de1c0faafeaf1fa4c2e67b4f9 diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index e0668c3..f1db50d 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -89,6 +89,16 @@ def parse_arguments(): '--proxy-type', default='SOCKS5', help='Proxy type (HTTP, SOCKS4, SOCKS5; Default: SOCKS5).') + parser.add_argument( + '-ta', + '--twitter-auth', + default=os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.rainbow_oauth', + help='Specify which OAuth profile to use for twitter. Default: ~/.rainbow_oauth.') + parser.add_argument( + '-pa', + '--pocket-auth', + default=os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.rainbow_pckt_oauth', + help='Specify which OAuth profile to use for pocket. Default: ~/.rainbow_pckt_oauth.') return parser.parse_args() @@ -122,11 +132,7 @@ def authen(): Authenticate with Twitter OAuth """ # When using rainbow stream you must authorize. - twitter_credential = os.environ.get( - 'HOME', - os.environ.get( - 'USERPROFILE', - '')) + os.sep + '.rainbow_oauth' + twitter_credential = g['twitter_oauth_path'] if not os.path.exists(twitter_credential): oauth_dance('Rainbow Stream', CONSUMER_KEY, @@ -144,12 +150,7 @@ def pckt_authen(): """ Authenticate with Pocket OAuth """ - pocket_credential = os.environ.get( - 'HOME', - os.environ.get( - 'USERPROFILE', - '')) + os.sep + '.rainbow_pckt_oauth' - + pocket_credential = g['pocket_oauth_path'] if not os.path.exists(pocket_credential): request_token = Pocket.get_request_token(consumer_key=PCKT_CONSUMER_KEY) auth_url = Pocket.get_auth_url(code=request_token, redirect_uri="/") @@ -238,6 +239,9 @@ def init(args): # Handle Ctrl C ctrl_c_handler = lambda signum, frame: quit() signal.signal(signal.SIGINT, ctrl_c_handler) + # Set OAuth file path (needs to happen before authen is called) + g['twitter_oauth_path'] = args.twitter_auth + g['pocket_oauth_path'] = args.pocket_auth # Upgrade notify upgrade_center() # Get name @@ -245,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())) @@ -322,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 @@ -330,7 +356,9 @@ def home(): num = c['HOME_TWEET_NUM'] if g['stuff'].isdigit(): num = int(g['stuff']) - for tweet in reversed(t.statuses.home_timeline(count=num)): + kwargs = {'count': num} + kwargs = add_tweetmode_parameter(kwargs) + for tweet in reversed(t.statuses.home_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -355,7 +383,9 @@ def mentions(): num = c['HOME_TWEET_NUM'] if g['stuff'].isdigit(): num = int(g['stuff']) - for tweet in reversed(t.statuses.mentions_timeline(count=num)): + kwargs = {'count': num} + kwargs = add_tweetmode_parameter(kwargs) + for tweet in reversed(t.statuses.mentions_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -398,8 +428,9 @@ def view(): num = int(g['stuff'].split()[1]) except: num = c['HOME_TWEET_NUM'] - for tweet in reversed( - t.statuses.user_timeline(count=num, screen_name=user[1:])): + kwargs = {'count': num, 'screen_name': user[1:]} + kwargs = add_tweetmode_parameter(kwargs) + for tweet in reversed(t.statuses.user_timeline(**kwargs)): draw(t=tweet) printNicely('') else: @@ -415,8 +446,10 @@ def view_my_tweets(): num = int(g['stuff']) except: num = c['HOME_TWEET_NUM'] + kwargs = {'count': num, 'screen_name': g['original_name']} + kwargs = add_tweetmode_parameter(kwargs) for tweet in reversed( - t.statuses.user_timeline(count=num, screen_name=g['original_name'])): + t.statuses.user_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -436,16 +469,18 @@ def search(): type = 'mixed' max_record = c['SEARCH_MAX_RECORD'] count = min(max_record, 100) + kwargs = { + 'q': query, + 'type': type, + 'count': count, + } + kwargs = add_tweetmode_parameter(kwargs) # Perform search - rel = t.search.tweets( - q=query, - type=type, - count=count - )['statuses'] + rel = t.search.tweets(**kwargs)['statuses'] # 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: @@ -456,9 +491,33 @@ def tweet(): """ Tweet """ - t = Twitter(auth=authen()) - t.statuses.update(status=g['stuff']) + # Regex to check if tweet contains '--i' pattern + pattern = '(.*) --i (.+)' + m = re.match(pattern, g['stuff']) + + if m is None: + # text only tweet + t = Twitter(auth=authen()) + t.statuses.update(status=g['stuff']) + else: + # A tweet with media items + body = m.group(1) + imagePaths = m.group(2) + + # Generating image ids + imageIds = [] + for impath in imagePaths.split(','): + imagedata = open(impath, 'rb').read() + # upload media + t_up = Twitter(domain='upload.twitter.com', + auth=authen()) + img_id = t_up.media.upload(media=imagedata)["media_id_string"] + imageIds.append(img_id) + + # send your tweet with the list of media ids: + t = Twitter(auth=authen()) + t.statuses.update(status=body, media_ids=",".join(imageIds)) def pocket(): """ @@ -535,7 +594,9 @@ def quote(): printNicely(red('Sorry I can\'t understand.')) return tid = c['tweet_dict'][id] - tweet = t.statuses.show(id=tid) + kwargs = {'id': tid} + kwargs = add_tweetmode_parameter(kwargs) + tweet = t.statuses.show(**kwargs) # Get formater formater = format_quote(tweet) if not formater: @@ -569,7 +630,9 @@ def allretweet(): except: num = c['RETWEETS_SHOW_NUM'] # Get result and display - rt_ary = t.statuses.retweets(id=tid, count=num) + kwargs = {'id': tid, 'count': num} + kwargs = add_tweetmode_parameter(kwargs) + rt_ary = t.statuses.retweets(**kwargs) if not rt_ary: printNicely(magenta('This tweet has no retweet.')) return @@ -589,14 +652,17 @@ def conversation(): printNicely(red('Sorry I can\'t understand.')) return tid = c['tweet_dict'][id] - tweet = t.statuses.show(id=tid) + kwargs = {'id': tid} + kwargs = add_tweetmode_parameter(kwargs) + tweet = t.statuses.show(**kwargs) limit = c['CONVERSATION_MAX'] thread_ref = [] thread_ref.append(tweet) prev_tid = tweet['in_reply_to_status_id'] while prev_tid and limit: limit -= 1 - tweet = t.statuses.show(id=prev_tid) + kwargs['id'] = prev_tid + tweet = t.statuses.show(**kwargs) prev_tid = tweet['in_reply_to_status_id'] thread_ref.append(tweet) @@ -618,7 +684,12 @@ def reply(): tid = c['tweet_dict'][id] user = t.statuses.show(id=tid)['user']['screen_name'] status = ' '.join(g['stuff'].split()[1:]) - status = '@' + user + ' ' + str2u(status) + # don't include own username for tweet chains + # for details see issue https://github.com/DTVD/rainbowstream/issues/163 + if user == g['original_name']: + status = str2u(status) + else: + status = '@' + user + ' ' + str2u(status) t.statuses.update(status=status, in_reply_to_status_id=tid) @@ -658,7 +729,9 @@ def favorite(): tid = c['tweet_dict'][id] t.favorites.create(_id=tid, include_entities=False) printNicely(green('Favorited.')) - draw(t.statuses.show(id=tid)) + kwargs = {'id': tid} + kwargs = add_tweetmode_parameter(kwargs) + draw(t.statuses.show(**kwargs)) printNicely('') @@ -675,7 +748,9 @@ def unfavorite(): tid = c['tweet_dict'][id] t.favorites.destroy(_id=tid) printNicely(green('Okay it\'s unfavorited.')) - draw(t.statuses.show(id=tid)) + kwargs = {'id': tid} + kwargs = add_tweetmode_parameter(kwargs) + draw(t.statuses.show(**kwargs)) printNicely('') @@ -690,7 +765,9 @@ def share(): except: printNicely(red('Tweet id is not valid.')) return - tweet = t.statuses.show(id=tid) + kwargs = {'id': tid} + kwargs = add_tweetmode_parameter(kwargs) + tweet = t.statuses.show(**kwargs) url = 'https://twitter.com/' + \ tweet['user']['screen_name'] + '/status/' + str(tid) import platform @@ -769,52 +846,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]] @@ -933,8 +994,9 @@ def ls(): # 300 users means 15 calls to the related API. The rate limit is 15 # calls per 15mn periods (see Twitter documentation). if ( number_of_users % 300 == 0 ): - printNicely( '(waiting 16mn for rate limits reasons...)' ) - time.sleep(16*60) + printNicely(light_yellow( 'We reached the limit of Twitter API.' )) + printNicely(light_yellow( 'You may need to wait about 15 minutes.' )) + break printNicely('All: ' + str(number_of_users) + ' ' + d[target] + '.') @@ -1460,7 +1522,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.')) @@ -1523,7 +1585,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'], @@ -1576,7 +1638,9 @@ def help_tweets(): usage = '\n' usage += s + grey(u'\u266A' + ' Tweets \n') usage += s * 2 + light_green('t oops ') + \ - 'will tweet "' + light_yellow('oops') + '" immediately.\n' + 'will tweet "' + light_yellow('oops') + '" immediately.\n' + \ + s * 3 + ' Optionally you can add --i [,,...] argument, e.g:\n' + \ + s * 3 + light_yellow(' t This tweet has images --i /path/to/test1.png,relative_test.jpg') + '\n' usage += s * 2 + \ light_green('rt 12 ') + ' will retweet to tweet with ' + \ light_yellow('[id=12]') + '.\n' @@ -2084,9 +2148,6 @@ def listen(): printNicely('') except TwitterHTTPError as e: detail_twitter_error(e) - except Exception: - debug_option() - printNicely(red('OMG something is wrong with Twitter API right now.')) finally: # Release the semaphore lock c['lock'] = False @@ -2128,98 +2189,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): """