From c240e37be9b13b794a223ecbe43966d10658b21e Mon Sep 17 00:00:00 2001 From: TalonTheDragon Date: Sun, 21 May 2023 21:57:29 +0200 Subject: [PATCH] Accessible label in MKNote should be a computed value. Also Fixes renoted note labels --- packages/client/src/components/MkNote.vue | 30 ++++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index d267f2d4de..63aa8978d4 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -461,21 +461,27 @@ function readPromo() { isDeleted.value = true; } -let accessibleLabel: string = getAccessibleLabel(); - -function getAccessibleLabel(): string { - let label = `${note.user.name ? note.user.name : note.user.username}: `; - if (note.cw && note.isHidden) { - label += `Content Warning: ${note.cw}`; - +const accessibleLabel = computed(() => { + let label = `${props.note.user.username}; `; + if (props.note.renote) { + label += `boosted ${props.note.renote.user.username}; `; + if (props.note.renote.cw) { + label += `content warning: ${props.note.renote.cw}; `; + } else { + label += `${props.note.renote.text}; `; + } } else { - label += `${note.text}`; + if (props.note.cw) { + label += `content warning: ${props.note.cw}; `; + } else { + label += `${props.note.text}; `; + } } - - - label += `${note.createdAt.toLocaleUpperCase()}`; + const date = new Date(props.note.createdAt); + label += `${date.toDateString()}`; return label; -} +}) + defineExpose({ focus, blur,