X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=8dbd89c6d2ce01edda8e41858e01a565015ccbbd;hp=5241f0d70a05b030d6756e6026ca896db3803154;hb=247c4e80f8030c11bfd1645ab02770db1284d819;hpb=04610460050d47adec2e7b9c8a354b6ee99a6317

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 5241f0d..8dbd89c 100644
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -530,11 +530,14 @@ def reply_all():
     tid = c['tweet_dict'][id]
     original_tweet = t.statuses.show(id=tid)
     text = original_tweet['text']
-    owner = '@' + original_tweet['user']['screen_name']
-    nick_ary = ['@' + re.sub('[\W_]', '', w)
-                for w in text.split() if w.startswith('@')] + [owner]
+    nick_ary = [original_tweet['user']['screen_name']]
+    for user in tweet['entities']['user_mentions']:
+        if user['screen_name'] not in nick_ary:
+            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_ary) + ' ' + str2u(status)
+    status = ' '.join(['@' + nick for nick in nick_ary]) + ' ' + str2u(status)
     t.statuses.update(status=status, in_reply_to_status_id=tid)