luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 11:53:13 +00:00
Code Issues Projects Releases Wiki Activity

Do not empty timeline of blocked users on block (#10359)

Browse source 
Fixes #10226
This commit is contained in:
ThibG 2019-03-24 19:15:58 +01:00 committed by Eugen Rochko
parent ef8b9afd1b
commit 94aceb85ad
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/mastodon/reducers/timelines.js
View file

@ -78,14 +78,15 @@ const updateTimeline = (state, timeline, status) => {
})); }));
}; };
const deleteStatus = (state, id, accountId, references) => { const deleteStatus = (state, id, accountId, references, exclude_account = null) => {
state.keySeq().forEach(timeline => { state.keySeq().forEach(timeline => {
state = state.updateIn([timeline, 'items'], list => list.filterNot(item => item === id)); if (exclude_account === null || (timeline !== `account:${exclude_account}` && !timeline.startsWith(`account:${exclude_account}:`)))
state = state.updateIn([timeline, 'items'], list => list.filterNot(item => item === id));
}); });
// Remove reblogs of deleted status // Remove reblogs of deleted status
references.forEach(ref => { references.forEach(ref => {
state = deleteStatus(state, ref[0], ref[1], []); state = deleteStatus(state, ref[0], ref[1], [], exclude_account);
}); });
return state; return state;
@ -104,7 +105,7 @@ const filterTimelines = (state, relationship, statuses) => {
} }
references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => [item.get('id'), item.get('account')]); references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => [item.get('id'), item.get('account')]);
state = deleteStatus(state, status.get('id'), status.get('account'), references); state = deleteStatus(state, status.get('id'), status.get('account'), references, relationship.id);
}); });
return state; return state;