diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-09 15:49:11 +0100 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2018-11-09 21:57:56 +0100 |
| commit | 0e80661e42bc0d0f364bad401cf93adf750542a3 (patch) | |
| tree | 747fc3961a7806e593b17d5a03b974bbc61bd6f2 /app | |
| parent | 44f5f7bab4dcf7cab06ef67a22e66789f8f9075c (diff) | |
[Glitch] Don't remove originals of boosted toots from timeline
Port 2b51b4094c18c56fe8252d90db2b62ef69913fac to glitch-soc
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/timelines.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/reducers/timelines.js b/app/javascript/flavours/glitch/reducers/timelines.js index 19e400b19..844a0580f 100644 --- a/app/javascript/flavours/glitch/reducers/timelines.js +++ b/app/javascript/flavours/glitch/reducers/timelines.js @@ -49,7 +49,7 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial) => })); }; -const updateTimeline = (state, timeline, status, references) => { +const updateTimeline = (state, timeline, status) => { const top = state.getIn([timeline, 'top']); const ids = state.getIn([timeline, 'items'], ImmutableList()); const includesId = ids.includes(status.get('id')); @@ -64,7 +64,6 @@ const updateTimeline = (state, timeline, status, references) => { return state.update(timeline, initialTimeline, map => map.withMutations(mMap => { if (!top) mMap.set('unread', unread + 1); if (top && ids.size > 40) newIds = newIds.take(20); - if (status.getIn(['reblog', 'id'], null) !== null) newIds = newIds.filterNot(item => references.includes(item)); mMap.set('items', newIds.unshift(status.get('id'))); })); }; @@ -119,7 +118,7 @@ export default function timelines(state = initialState, action) { case TIMELINE_EXPAND_SUCCESS: return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial); case TIMELINE_UPDATE: - return updateTimeline(state, action.timeline, fromJS(action.status), action.references); + return updateTimeline(state, action.timeline, fromJS(action.status)); case TIMELINE_DELETE: return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf); case ACCOUNT_BLOCK_SUCCESS: |