projects
/
rainbowstream.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added `tweet_mode='extended'` option to `t.statuses` calls
[rainbowstream.git]
/
rainbowstream
/
rainbow.py
diff --git
a/rainbowstream/rainbow.py
b/rainbowstream/rainbow.py
index e0668c32522506195414415a551030659f1a56fb..21b1965766edc903df7220902dbfe67279dbfd70 100644
(file)
--- a/
rainbowstream/rainbow.py
+++ b/
rainbowstream/rainbow.py
@@
-330,7
+330,7
@@
def home():
num = c['HOME_TWEET_NUM']
if g['stuff'].isdigit():
num = int(g['stuff'])
num = c['HOME_TWEET_NUM']
if g['stuff'].isdigit():
num = int(g['stuff'])
- for tweet in reversed(t.statuses.home_timeline(count=num)):
+ for tweet in reversed(t.statuses.home_timeline(count=num
, tweet_mode='extended'
)):
draw(t=tweet)
printNicely('')
draw(t=tweet)
printNicely('')
@@
-355,7
+355,7
@@
def mentions():
num = c['HOME_TWEET_NUM']
if g['stuff'].isdigit():
num = int(g['stuff'])
num = c['HOME_TWEET_NUM']
if g['stuff'].isdigit():
num = int(g['stuff'])
- for tweet in reversed(t.statuses.mentions_timeline(count=num)):
+ for tweet in reversed(t.statuses.mentions_timeline(count=num
, tweet_mode='extended'
)):
draw(t=tweet)
printNicely('')
draw(t=tweet)
printNicely('')
@@
-399,7
+399,7
@@
def view():
except:
num = c['HOME_TWEET_NUM']
for tweet in reversed(
except:
num = c['HOME_TWEET_NUM']
for tweet in reversed(
- t.statuses.user_timeline(count=num, screen_name=user[1:])):
+ t.statuses.user_timeline(count=num, screen_name=user[1:]
, tweet_mode='extended'
)):
draw(t=tweet)
printNicely('')
else:
draw(t=tweet)
printNicely('')
else:
@@
-416,7
+416,7
@@
def view_my_tweets():
except:
num = c['HOME_TWEET_NUM']
for tweet in reversed(
except:
num = c['HOME_TWEET_NUM']
for tweet in reversed(
- t.statuses.user_timeline(count=num, screen_name=g['original_name'])):
+ t.statuses.user_timeline(count=num, screen_name=g['original_name']
, tweet_mode='extended'
)):
draw(t=tweet)
printNicely('')
draw(t=tweet)
printNicely('')
@@
-535,7
+535,7
@@
def quote():
printNicely(red('Sorry I can\'t understand.'))
return
tid = c['tweet_dict'][id]
printNicely(red('Sorry I can\'t understand.'))
return
tid = c['tweet_dict'][id]
- tweet = t.statuses.show(id=tid)
+ tweet = t.statuses.show(id=tid
, tweet_mode='extended'
)
# Get formater
formater = format_quote(tweet)
if not formater:
# Get formater
formater = format_quote(tweet)
if not formater:
@@
-569,7
+569,7
@@
def allretweet():
except:
num = c['RETWEETS_SHOW_NUM']
# Get result and display
except:
num = c['RETWEETS_SHOW_NUM']
# Get result and display
- rt_ary = t.statuses.retweets(id=tid, count=num)
+ rt_ary = t.statuses.retweets(id=tid, count=num
, tweet_mode='extended'
)
if not rt_ary:
printNicely(magenta('This tweet has no retweet.'))
return
if not rt_ary:
printNicely(magenta('This tweet has no retweet.'))
return
@@
-589,14
+589,14
@@
def conversation():
printNicely(red('Sorry I can\'t understand.'))
return
tid = c['tweet_dict'][id]
printNicely(red('Sorry I can\'t understand.'))
return
tid = c['tweet_dict'][id]
- tweet = t.statuses.show(id=tid)
+ tweet = t.statuses.show(id=tid
, tweet_mode='extended'
)
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
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)
+ tweet = t.statuses.show(id=prev_tid
, tweet_mode='extended'
)
prev_tid = tweet['in_reply_to_status_id']
thread_ref.append(tweet)
prev_tid = tweet['in_reply_to_status_id']
thread_ref.append(tweet)
@@
-618,7
+618,12
@@
def reply():
tid = c['tweet_dict'][id]
user = t.statuses.show(id=tid)['user']['screen_name']
status = ' '.join(g['stuff'].split()[1:])
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)
t.statuses.update(status=status, in_reply_to_status_id=tid)
@@
-658,7
+663,7
@@
def favorite():
tid = c['tweet_dict'][id]
t.favorites.create(_id=tid, include_entities=False)
printNicely(green('Favorited.'))
tid = c['tweet_dict'][id]
t.favorites.create(_id=tid, include_entities=False)
printNicely(green('Favorited.'))
- draw(t.statuses.show(id=tid))
+ draw(t.statuses.show(id=tid
, tweet_mode='extended'
))
printNicely('')
printNicely('')
@@
-675,7
+680,7
@@
def unfavorite():
tid = c['tweet_dict'][id]
t.favorites.destroy(_id=tid)
printNicely(green('Okay it\'s unfavorited.'))
tid = c['tweet_dict'][id]
t.favorites.destroy(_id=tid)
printNicely(green('Okay it\'s unfavorited.'))
- draw(t.statuses.show(id=tid))
+ draw(t.statuses.show(id=tid
, tweet_mode='extended'
))
printNicely('')
printNicely('')
@@
-690,7
+695,7
@@
def share():
except:
printNicely(red('Tweet id is not valid.'))
return
except:
printNicely(red('Tweet id is not valid.'))
return
- tweet = t.statuses.show(id=tid)
+ tweet = t.statuses.show(id=tid
, tweet_mode='extended'
)
url = 'https://twitter.com/' + \
tweet['user']['screen_name'] + '/status/' + str(tid)
import platform
url = 'https://twitter.com/' + \
tweet['user']['screen_name'] + '/status/' + str(tid)
import platform
@@
-933,8
+938,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 ):
# 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] + '.')
printNicely('All: ' + str(number_of_users) + ' ' + d[target] + '.')