pleroma-fe

commit: 3059a699ac12e18895cbe56608d1eed87cdb0d56
parent: bbd80c54bfe0c9142f1bf474b27824dbeea0f904
Author: lambda <pleromagit@rogerbraun.net>
Date:   Thu,  9 Nov 2017 07:45:19 +0000

Merge branch 'fix/dont-show-rts-more-than-once' into 'develop'

Don't show repeats that have been shown already.

See merge request pleroma/pleroma-fe!143
Diffstat:
M
src/modules/statuses.js
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -271,8 +271,14 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       let retweet
       // If the retweeted status is already there, don't add the retweet
       // to the timeline.
-      if (timeline && find(timelineObject.statuses, {id: retweetedStatus.id})) {
-        // Already have it visible, don't add to timeline, don't show.
+      if (timeline && find(timelineObject.statuses, (s) => {
+        if (s.retweeted_status) {
+          return s.id === retweetedStatus.id || s.retweeted_status.id === retweetedStatus.id
+        } else {
+          return s.id === retweetedStatus.id
+        }
+      })) {
+        // Already have it visible (either as the original or another RT), don't add to timeline, don't show.
         retweet = addStatus(status, false, false)
       } else {
         retweet = addStatus(status, showImmediately)