Iterate over the original_tweet variable, not the tweet module

[rainbowstream.git] / rainbowstream / rainbow.py

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 8dbd89c6d2ce01edda8e41858e01a565015ccbbd..742930e0a53f14297120a62fcf589be05d1e7b22 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -531,11 +531,10 @@ def reply_all():
     original_tweet = t.statuses.show(id=tid)
     text = original_tweet['text']
     nick_ary = [original_tweet['user']['screen_name']]
     original_tweet = t.statuses.show(id=tid)
     text = original_tweet['text']
     nick_ary = [original_tweet['user']['screen_name']]

-    for user in tweet['entities']['user_mentions']:
-        if user['screen_name'] not in nick_ary:
+    for user in list(original_tweet['entities']['user_mentions']):
+        if user['screen_name'] not in nick_ary \
+                and user['screen_name'] != g['original_name']:

             nick_ary.append(user['screen_name'])
             nick_ary.append(user['screen_name'])

-    if g['original_name'] in nick_ary:
-        nick_ary.remove(g['original_name'])

     status = ' '.join(g['stuff'].split()[1:])
     status = ' '.join(['@' + nick for nick in nick_ary]) + ' ' + str2u(status)
     t.statuses.update(status=status, in_reply_to_status_id=tid)
     status = ' '.join(g['stuff'].split()[1:])
     status = ' '.join(['@' + nick for nick in nick_ary]) + ' ' + str2u(status)
     t.statuses.update(status=status, in_reply_to_status_id=tid)