From 7871d29aff992162d4558e1db25d2f78f65ab38c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 19 May 2018 02:51:29 +0200
Subject: [PATCH] Skip pagination logic for pinned account timelines in reducer
(#7540)
Fix #7516
---
app/javascript/mastodon/reducers/timelines.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index b09d78b0f..916a091eb 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -33,6 +33,11 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial) =>
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);