bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'oakes/mute-block-response' into 'develop'

Browse source 
Update unmute/unblock buttons correctly

See merge request soapbox-pub/soapbox!2640
This commit is contained in:
Alex Gleason 2023-08-10 19:57:58 +00:00
commit 085f686c7d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/soapbox/actions/accounts.ts
View file

@ -231,6 +231,7 @@ const blockAccount = (id: string) =>
return api(getState) return api(getState)
.post(`/api/v1/accounts/${id}/block`) .post(`/api/v1/accounts/${id}/block`)
.then(response => { .then(response => {
dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
// Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
return dispatch(blockAccountSuccess(response.data, getState().statuses)); return dispatch(blockAccountSuccess(response.data, getState().statuses));
}).catch(error => dispatch(blockAccountFail(error))); }).catch(error => dispatch(blockAccountFail(error)));
@ -244,7 +245,10 @@ const unblockAccount = (id: string) =>
return api(getState) return api(getState)
.post(`/api/v1/accounts/${id}/unblock`) .post(`/api/v1/accounts/${id}/unblock`)
.then(response => dispatch(unblockAccountSuccess(response.data))) .then(response => {
dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
return dispatch(unblockAccountSuccess(response.data));
})
.catch(error => dispatch(unblockAccountFail(error))); .catch(error => dispatch(unblockAccountFail(error)));
}; };
@ -304,6 +308,7 @@ const muteAccount = (id: string, notifications?: boolean, duration = 0) =>
return api(getState) return api(getState)
.post(`/api/v1/accounts/${id}/mute`, params) .post(`/api/v1/accounts/${id}/mute`, params)
.then(response => { .then(response => {
dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
// Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
return dispatch(muteAccountSuccess(response.data, getState().statuses)); return dispatch(muteAccountSuccess(response.data, getState().statuses));
}) })
@ -318,7 +323,10 @@ const unmuteAccount = (id: string) =>
return api(getState) return api(getState)
.post(`/api/v1/accounts/${id}/unmute`) .post(`/api/v1/accounts/${id}/unmute`)
.then(response => dispatch(unmuteAccountSuccess(response.data))) .then(response => {
dispatch(importEntities([response.data], Entities.RELATIONSHIPS));
return dispatch(unmuteAccountSuccess(response.data));
})
.catch(error => dispatch(unmuteAccountFail(error))); .catch(error => dispatch(unmuteAccountFail(error)));
}; };