mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 12:05:07 +01:00
Code Issues Projects Releases Wiki Activity

Don't remove originals of boosted toots from timeline (#5479)

Browse Source 
* Don't remove originals of boosted toots from timeline

* Remove unused argument to updateTimeline
This commit is contained in:
sdukhovni 2017-11-24 08:43:53 -05:00 committed by Eugen Rochko
parent 1104ac35d3
commit 2b51b4094c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/reducers/timelines.js
View File

@ -55,7 +55,7 @@ const appendNormalizedTimeline = (state, timeline, statuses, next) => {
})); }));
}; };
const updateTimeline = (state, timeline, status, references) => { const updateTimeline = (state, timeline, status) => {
const top = state.getIn([timeline, 'top']); const top = state.getIn([timeline, 'top']);
const ids = state.getIn([timeline, 'items'], ImmutableList()); const ids = state.getIn([timeline, 'items'], ImmutableList());
const includesId = ids.includes(status.get('id')); const includesId = ids.includes(status.get('id'));
@ -70,7 +70,6 @@ const updateTimeline = (state, timeline, status, references) => {
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => { return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
if (!top) mMap.set('unread', unread + 1); if (!top) mMap.set('unread', unread + 1);
if (top && ids.size > 40) newIds = newIds.take(20); 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'))); mMap.set('items', newIds.unshift(status.get('id')));
})); }));
}; };
@ -129,7 +128,7 @@ export default function timelines(state = initialState, action) {
case TIMELINE_EXPAND_SUCCESS: case TIMELINE_EXPAND_SUCCESS:
return appendNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next); return appendNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next);
case TIMELINE_UPDATE: case TIMELINE_UPDATE:
return updateTimeline(state, action.timeline, fromJS(action.status), action.references); return updateTimeline(state, action.timeline, fromJS(action.status));
case TIMELINE_DELETE: case TIMELINE_DELETE:
return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf); return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
case ACCOUNT_BLOCK_SUCCESS: case ACCOUNT_BLOCK_SUCCESS: