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

fix(drafts): remove and do not focus empty reply drafts (#850)

Browse source
This commit is contained in:
Piotrek Tomczewski 2023-01-08 14:54:12 +01:00 committed by GitHub
parent 805f7731ad
commit fcae855eea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
composables/masto/statusDrafts.ts
View file

@ -54,12 +54,17 @@ function mentionHTML(acct: string) {
return `<span data-type="mention" data-id="${acct}" contenteditable="false">@${acct}</span>` return `<span data-type="mention" data-id="${acct}" contenteditable="false">@${acct}</span>`
} }
export function getReplyDraft(status: mastodon.v1.Status) { function getAccountsToMention(status: mastodon.v1.Status) {
const accountsToMention: string[] = []
const userId = currentUser.value?.account.id const userId = currentUser.value?.account.id
const accountsToMention: string[] = []
if (status.account.id !== userId) if (status.account.id !== userId)
accountsToMention.push(status.account.acct) accountsToMention.push(status.account.acct)
accountsToMention.push(...(status.mentions.filter(mention => mention.id !== userId).map(mention => mention.acct))) accountsToMention.push(...(status.mentions.filter(mention => mention.id !== userId).map(mention => mention.acct)))
return accountsToMention
}
export function getReplyDraft(status: mastodon.v1.Status) {
const accountsToMention = getAccountsToMention(status)
return { return {
key: `reply-${status.id}`, key: `reply-${status.id}`,
draft: () => { draft: () => {
@ -77,7 +82,9 @@ export const isEmptyDraft = (draft: Draft | null | undefined) => {
return true return true
const { params, attachments } = draft const { params, attachments } = draft
const status = params.status || '' const status = params.status || ''
return (status.length === 0 || status === '<p></p>') const text = htmlToText(status).trim().replace(/^(@\S+\s?)+/, '').trim()
return (text.length === 0)
&& attachments.length === 0 && attachments.length === 0
&& (params.spoilerText || '').length === 0 && (params.spoilerText || '').length === 0
} }