mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix error when deleting a status 

Port 7d12522ed7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
pull/2751/head
Renaud Chaput 2024-06-21 00:39:06 +02:00 committed by Claire
parent 6300273664
commit 2f994bb34a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/actions/timelines.js
View File

@ -74,10 +74,10 @@ export function updateTimeline(timeline, status, accept) {
export function deleteFromTimelines(id) { export function deleteFromTimelines(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
const accountId = getState().getIn(['statuses', id, 'account']); const accountId = getState().getIn(['statuses', id, 'account']);
const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).toJSON(); const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id')).valueSeq().toJSON();
const reblogOf = getState().getIn(['statuses', id, 'reblog'], null); const reblogOf = getState().getIn(['statuses', id, 'reblog'], null);
dispatch(timelineDelete(id, accountId, references, reblogOf)); dispatch(timelineDelete({ statusId: id, accountId, references, reblogOf }));
}; };
} }

2
app/javascript/flavours/glitch/reducers/timelines.js
View File

@ -165,7 +165,7 @@ const filterTimelines = (state, relationship, statuses) => {
return; return;
} }
references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => item.get('id')); references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => item.get('id')).valueSeq().toJSON();
state = deleteStatus(state, status.get('id'), references, relationship.id); state = deleteStatus(state, status.get('id'), references, relationship.id);
}); });