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
This commit is contained in:
lambda 2017-11-09 07:45:19 +00:00
commit 3059a699ac
1 changed files with 8 additions and 2 deletions

View File

@ -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)