diff options
author | ThibG <thib@sitedethib.com> | 2019-06-05 13:39:59 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-05 13:39:59 +0200 |
commit | d34a3a2cc72c12ae5119150a8ac18dd8fb7a4e6b (patch) | |
tree | ccd39644aa3891264c4020d9fdf4cdb8e676463e /app | |
parent | 6c464cd42439ae2140b3a6975bc075ba06c71bcb (diff) |
Fix refreshing featured toots when the new collection is empty (#10971)
Fixes #10945
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/reducers/timelines.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js index 6a972f967..309a95a19 100644 --- a/app/javascript/mastodon/reducers/timelines.js +++ b/app/javascript/mastodon/reducers/timelines.js @@ -35,14 +35,12 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is if (!next && !isLoadingRecent) mMap.set('hasMore', false); - if (!statuses.isEmpty()) { + if (timeline.endsWith(':pinned')) { + mMap.set('items', statuses.map(status => status.get('id'))); + } else if (!statuses.isEmpty()) { mMap.update('items', ImmutableList(), oldIds => { const newIds = statuses.map(status => status.get('id')); - if (timeline.indexOf(':pinned') !== -1) { - return newIds; - } - const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1; const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0); |