treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix potential duplicate statuses in Explore tab (#22121)

pull/41/head
Claire 2022-12-07 14:12:55 +01:00 committed by GitHub
parent b59fb28e90
commit c8a1faa86b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/javascript/mastodon/reducers/status_lists.js
View File

@ -25,7 +25,7 @@ import {
TRENDS_STATUSES_EXPAND_SUCCESS, TRENDS_STATUSES_EXPAND_SUCCESS,
TRENDS_STATUSES_EXPAND_FAIL, TRENDS_STATUSES_EXPAND_FAIL,
} from '../actions/trends'; } from '../actions/trends';
import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
import { import {
FAVOURITE_SUCCESS, FAVOURITE_SUCCESS,
UNFAVOURITE_SUCCESS, UNFAVOURITE_SUCCESS,
@ -43,22 +43,22 @@ const initialState = ImmutableMap({
favourites: ImmutableMap({ favourites: ImmutableMap({
next: null, next: null,
loaded: false, loaded: false,
items: ImmutableList(), items: ImmutableOrderedSet(),
}), }),
bookmarks: ImmutableMap({ bookmarks: ImmutableMap({
next: null, next: null,
loaded: false, loaded: false,
items: ImmutableList(), items: ImmutableOrderedSet(),
}), }),
pins: ImmutableMap({ pins: ImmutableMap({
next: null, next: null,
loaded: false, loaded: false,
items: ImmutableList(), items: ImmutableOrderedSet(),
}), }),
trending: ImmutableMap({ trending: ImmutableMap({
next: null, next: null,
loaded: false, loaded: false,
items: ImmutableList(), items: ImmutableOrderedSet(),
}), }),
}); });
@ -67,7 +67,7 @@ const normalizeList = (state, listType, statuses, next) => {
map.set('next', next); map.set('next', next);
map.set('loaded', true); map.set('loaded', true);
map.set('isLoading', false); map.set('isLoading', false);
map.set('items', ImmutableList(statuses.map(item => item.id))); map.set('items', ImmutableOrderedSet(statuses.map(item => item.id)));
})); }));
}; };
@ -75,20 +75,22 @@ const appendToList = (state, listType, statuses, next) => {
return state.update(listType, listMap => listMap.withMutations(map => { return state.update(listType, listMap => listMap.withMutations(map => {
map.set('next', next); map.set('next', next);
map.set('isLoading', false); map.set('isLoading', false);
map.set('items', map.get('items').concat(statuses.map(item => item.id))); map.set('items', map.get('items').union(statuses.map(item => item.id)));
})); }));
}; };
const prependOneToList = (state, listType, status) => { const prependOneToList = (state, listType, status) => {
return state.update(listType, listMap => listMap.withMutations(map => { return state.updateIn([listType, 'items'], (list) => {
map.set('items', map.get('items').unshift(status.get('id'))); if (list.includes(status.get('id'))) {
})); return list;
} else {
return ImmutableOrderedSet([status.get('id')]).union(list);
}
});
}; };
const removeOneFromList = (state, listType, status) => { const removeOneFromList = (state, listType, status) => {
return state.update(listType, listMap => listMap.withMutations(map => { return state.updateIn([listType, 'items'], (list) => list.delete(status.get('id')));
map.set('items', map.get('items').filter(item => item !== status.get('id')));
}));
}; };
export default function statusLists(state = initialState, action) { export default function statusLists(state = initialState, action) {
@ -139,7 +141,7 @@ export default function statusLists(state = initialState, action) {
return removeOneFromList(state, 'pins', action.status); return removeOneFromList(state, 'pins', action.status);
case ACCOUNT_BLOCK_SUCCESS: case ACCOUNT_BLOCK_SUCCESS:
case ACCOUNT_MUTE_SUCCESS: case ACCOUNT_MUTE_SUCCESS:
return state.updateIn(['trending', 'items'], ImmutableList(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id)); return state.updateIn(['trending', 'items'], ImmutableOrderedSet(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id));
default: default:
return state; return state;
} }