diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue index 7b041121..628b8465 100644 --- a/components/account/AccountMoreButton.vue +++ b/components/account/AccountMoreButton.vue @@ -25,13 +25,16 @@ function shareAccount() { } async function toggleReblogs() { - if (!relationship.value!.showingReblogs && await openConfirmDialog({ - title: t('confirm.show_reblogs.title'), - description: t('confirm.show_reblogs.description', [account.acct]), - confirm: t('confirm.show_reblogs.confirm'), - cancel: t('confirm.show_reblogs.cancel'), - }) !== 'confirm') - return + if (!relationship.value!.showingReblogs) { + const dialogChoice = await openConfirmDialog({ + title: t('confirm.show_reblogs.title'), + description: t('confirm.show_reblogs.description', [account.acct]), + confirm: t('confirm.show_reblogs.confirm'), + cancel: t('confirm.show_reblogs.cancel'), + }) + if (dialogChoice.choice !== 'confirm') + return + } const showingReblogs = !relationship.value?.showingReblogs relationship.value = await client.value.v1.accounts.$select(account.id).follow({ reblogs: showingReblogs }) diff --git a/components/common/CommonCheckbox.vue b/components/common/CommonCheckbox.vue index 24e35855..ba85155b 100644 --- a/components/common/CommonCheckbox.vue +++ b/components/common/CommonCheckbox.vue @@ -4,6 +4,8 @@ defineProps<{ hover?: boolean iconChecked?: string iconUnchecked?: string + checkedIconColor?: string + prependCheckbox?: boolean }>() const modelValue = defineModel() @@ -15,9 +17,12 @@ const modelValue = defineModel() v-bind="$attrs" @click.prevent="modelValue = !modelValue" > - {{ label }} + {{ label }}