Merge branch 'tusooa/1244-report-delete-fail' into 'develop'
Display delete status errors Closes #1244 See merge request pleroma/pleroma-fe!1769
This commit is contained in:
commit
9c376b3511
@ -879,6 +879,7 @@
|
|||||||
"repeat_confirm_accept_button": "Repeat",
|
"repeat_confirm_accept_button": "Repeat",
|
||||||
"repeat_confirm_cancel_button": "Do not repeat",
|
"repeat_confirm_cancel_button": "Do not repeat",
|
||||||
"delete": "Delete status",
|
"delete": "Delete status",
|
||||||
|
"delete_error": "Error deleting status: {0}",
|
||||||
"edit": "Edit status",
|
"edit": "Edit status",
|
||||||
"edited_at": "(last edited {time})",
|
"edited_at": "(last edited {time})",
|
||||||
"pin": "Pin on profile",
|
"pin": "Pin on profile",
|
||||||
|
@ -615,9 +615,19 @@ const statuses = {
|
|||||||
fetchStatusHistory ({ rootState, dispatch }, status) {
|
fetchStatusHistory ({ rootState, dispatch }, status) {
|
||||||
return apiService.fetchStatusHistory({ status })
|
return apiService.fetchStatusHistory({ status })
|
||||||
},
|
},
|
||||||
deleteStatus ({ rootState, commit }, status) {
|
deleteStatus ({ rootState, commit, dispatch }, status) {
|
||||||
commit('setDeleted', { status })
|
|
||||||
apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
|
apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
|
||||||
|
.then((_) => {
|
||||||
|
commit('setDeleted', { status })
|
||||||
|
})
|
||||||
|
.catch((e) => {
|
||||||
|
dispatch('pushGlobalNotice', {
|
||||||
|
level: 'error',
|
||||||
|
messageKey: 'status.delete_error',
|
||||||
|
messageArgs: [e.message],
|
||||||
|
timeout: 5000
|
||||||
|
})
|
||||||
|
})
|
||||||
},
|
},
|
||||||
deleteStatusById ({ rootState, commit }, id) {
|
deleteStatusById ({ rootState, commit }, id) {
|
||||||
const status = rootState.statuses.allStatusesObject[id]
|
const status = rootState.statuses.allStatusesObject[id]
|
||||||
|
@ -923,8 +923,9 @@ const editStatus = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const deleteStatus = ({ id, credentials }) => {
|
const deleteStatus = ({ id, credentials }) => {
|
||||||
return fetch(MASTODON_DELETE_URL(id), {
|
return promisedRequest({
|
||||||
headers: authHeaders(credentials),
|
url: MASTODON_DELETE_URL(id),
|
||||||
|
credentials,
|
||||||
method: 'DELETE'
|
method: 'DELETE'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user