teutat3s/elk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix(status): add language from status when redraft

Browse source
This commit is contained in:
三咲智子 2023-01-04 17:39:12 +08:00
parent 8983edd1bb
commit 154885ca96
No known key found for this signature in database
GPG key ID: 69992F2250DFD93E
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/status/StatusActionsMore.vue
View file

@ -91,7 +91,7 @@ const deleteAndRedraft = async () => {
await openPublishDialog('dialog', await getDraftFromStatus(status), true) await openPublishDialog('dialog', await getDraftFromStatus(status), true)
// Go to the new status, if the page is the old status // Go to the new status, if the page is the old status
if (lastPublishDialogStatus.value && route.matched.some(m => m.path === '/:server?/@:account/:status')) if (lastPublishDialogStatus.value && route.name === 'status')
router.push(getStatusRoute(lastPublishDialogStatus.value)) router.push(getStatusRoute(lastPublishDialogStatus.value))
} }

3
composables/statusDrafts.ts
View file

@ -13,6 +13,7 @@ export function getDefaultDraft(options: Partial<Draft['params'] & Omit<Draft, '
initialText = '', initialText = '',
sensitive = false, sensitive = false,
spoilerText = '', spoilerText = '',
language,
} = options } = options
return { return {
@ -22,6 +23,7 @@ export function getDefaultDraft(options: Partial<Draft['params'] & Omit<Draft, '
visibility, visibility,
sensitive, sensitive,
spoilerText, spoilerText,
language,
}, },
attachments, attachments,
initialText, initialText,
@ -36,6 +38,7 @@ export async function getDraftFromStatus(status: Status): Promise<Draft> {
attachments: status.mediaAttachments, attachments: status.mediaAttachments,
sensitive: status.sensitive, sensitive: status.sensitive,
spoilerText: status.spoilerText, spoilerText: status.spoilerText,
language: status.language,
}) })
} }