diff options
| author | Marie <github@yuugi.dev> | 2025-03-21 16:46:47 +0000 |
|---|---|---|
| committer | Marie <github@yuugi.dev> | 2025-03-21 16:46:47 +0000 |
| commit | aa1691295bfaa2abd38f3c538bd400e7f37ff85b (patch) | |
| tree | e31337650ee048fb310852625bb672bdd6498cf2 /packages/frontend/src | |
| parent | merge: Make sure that scheduledNote* types are only showing on and off option... (diff) | |
| parent | chore: lint (diff) | |
| download | sharkey-aa1691295bfaa2abd38f3c538bd400e7f37ff85b.tar.gz sharkey-aa1691295bfaa2abd38f3c538bd400e7f37ff85b.tar.bz2 sharkey-aa1691295bfaa2abd38f3c538bd400e7f37ff85b.zip | |
merge: Make confirm follow prompt not show up when cancelling a follow request (!941)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/941
Closes #822
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Diffstat (limited to 'packages/frontend/src')
| -rw-r--r-- | packages/frontend/src/components/MkFollowButton.vue | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue index 42e8485f46..93c3b481b2 100644 --- a/packages/frontend/src/components/MkFollowButton.vue +++ b/packages/frontend/src/components/MkFollowButton.vue @@ -106,7 +106,7 @@ async function onClick() { userId: props.user.id, }); } else { - if (defaultStore.state.alwaysConfirmFollow) { + if (defaultStore.state.alwaysConfirmFollow && !hasPendingFollowRequestFromYou.value) { const { canceled } = await os.confirm({ type: 'question', text: i18n.tsx.followConfirm({ name: props.user.name || props.user.username }), @@ -119,6 +119,16 @@ async function onClick() { } if (hasPendingFollowRequestFromYou.value) { + const { canceled } = await os.confirm({ + type: 'question', + text: i18n.ts.undoFollowRequestConfirm, + }); + + if (canceled) { + wait.value = false; + return; + } + await misskeyApi('following/requests/cancel', { userId: props.user.id, }); |