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

fix: publish widget mentions (#1198)

Browse source
This commit is contained in:
patak 2023-01-16 06:10:33 +01:00 committed by GitHub
parent d24c1da35e
commit bb2e3ab44f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/content/ContentMentionGroup.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<p flex="~ gap-1" items-center text-sm class="zen-none"> <p flex="~ gap-1 wrap" items-center text-sm class="zen-none">
<span i-ri-arrow-right-line ml--1 text-secondary-light /><slot /> <span i-ri-arrow-right-line ml--1 text-secondary-light /><slot />
</p> </p>
</template> </template>

6
components/publish/PublishWidget.vue
View file

@ -133,9 +133,9 @@ defineExpose({
:class="[isSending ? 'pointer-events-none' : '', isOverDropZone ? '!border-primary' : '']" :class="[isSending ? 'pointer-events-none' : '', isOverDropZone ? '!border-primary' : '']"
> >
<ContentMentionGroup v-if="draft.mentions?.length && shouldExpanded"> <ContentMentionGroup v-if="draft.mentions?.length && shouldExpanded">
<div v-for="m of draft.mentions" :key="m" text-primary> <button v-for="m, i of draft.mentions" :key="m" text-primary hover:color-red @click="draft.mentions?.splice(i, 1)">
@{{ m }} {{ acctToShortHandle(m) }}
</div> </button>
</ContentMentionGroup> </ContentMentionGroup>
<div v-if="draft.params.sensitive"> <div v-if="draft.params.sensitive">

6
composables/masto/account.ts
View file

@ -7,10 +7,14 @@ export function getDisplayName(account: mastodon.v1.Account, options?: { rich?:
return displayName.replace(/:([\w-]+?):/g, '') return displayName.replace(/:([\w-]+?):/g, '')
} }
export function acctToShortHandle(acct: string) {
return `@${acct.includes('@') ? acct.split('@')[0] : acct}`
}
export function getShortHandle({ acct }: mastodon.v1.Account) { export function getShortHandle({ acct }: mastodon.v1.Account) {
if (!acct) if (!acct)
return '' return ''
return `@${acct.includes('@') ? acct.split('@')[0] : acct}` return acctToShortHandle(acct)
} }
export function getServerName(account: mastodon.v1.Account) { export function getServerName(account: mastodon.v1.Account) {