From e5df77b2a8ac3957b5bd7716c287d35571742d48 Mon Sep 17 00:00:00 2001 From: Louise de Beaufort Date: Fri, 19 Jul 2019 17:09:52 +0200 Subject: [PATCH] fix: Use unformatted status content in deleteAndRedraft (#1340) * Use unformatted status content in deleteAndRedraft * deleteStatus always returns an object even when the deletion fails * throw error fixes #1340 --- src/routes/_actions/delete.js | 4 +++- src/routes/_actions/deleteAndRedraft.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/routes/_actions/delete.js b/src/routes/_actions/delete.js index 421566e7..95a440a1 100644 --- a/src/routes/_actions/delete.js +++ b/src/routes/_actions/delete.js @@ -6,11 +6,13 @@ import { deleteStatus as deleteStatusLocally } from './deleteStatuses' export async function doDeleteStatus (statusId) { let { currentInstance, accessToken } = store.get() try { - await deleteStatus(currentInstance, accessToken, statusId) + let deletedStatus = await deleteStatus(currentInstance, accessToken, statusId) deleteStatusLocally(currentInstance, statusId) toast.say('Status deleted.') + return deletedStatus } catch (e) { console.error(e) toast.say('Unable to delete status: ' + (e.message || '')) + throw e } } diff --git a/src/routes/_actions/deleteAndRedraft.js b/src/routes/_actions/deleteAndRedraft.js index aeb087dc..68ae9b46 100644 --- a/src/routes/_actions/deleteAndRedraft.js +++ b/src/routes/_actions/deleteAndRedraft.js @@ -6,10 +6,10 @@ import { store } from '../_store/store' export async function deleteAndRedraft (status) { let deleteStatusPromise = doDeleteStatus(status.id) let dialogPromise = importShowComposeDialog() - await deleteStatusPromise + let deletedStatus = await deleteStatusPromise store.setComposeData('dialog', { - text: statusHtmlToPlainText(status.content, status.mentions), + text: deletedStatus.text || statusHtmlToPlainText(status.content, status.mentions), contentWarningShown: !!status.spoiler_text, contentWarning: status.spoiler_text || '', postPrivacy: status.visibility,