Merge pull request #209 from Lertsenem/pr-lsratelimit

Avoid 'Rate limit exceeded' error on 'ls' command

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index e0668c32522506195414415a551030659f1a56fb..118667c674e7ce41aa2a50db2a0b1fd1e4ba57b2 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -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:])
-    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)