summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2024-11-15 18:00:22 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2024-11-15 18:00:22 +0900
commitee2c017f485234a987f7c630704a7980fe1b41a0 (patch)
tree6cfce55e82c9299c735c7308fdbbf695095303d6 /packages/frontend/src/components
parentchore(frontend): tweak animation style (diff)
parentchore(deps): bump codecov/codecov-action from 4 to 5 (#14961) (diff)
downloadmisskey-ee2c017f485234a987f7c630704a7980fe1b41a0.tar.gz
misskey-ee2c017f485234a987f7c630704a7980fe1b41a0.tar.bz2
misskey-ee2c017f485234a987f7c630704a7980fe1b41a0.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkFollowButton.vue10
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index cc07175907..c1dc67f776 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -91,7 +91,10 @@ async function onClick() {
text: i18n.tsx.unfollowConfirm({ name: props.user.name || props.user.username }),
});
- if (canceled) return;
+ if (canceled) {
+ wait.value = false;
+ return;
+ }
await misskeyApi('following/delete', {
userId: props.user.id,
@@ -125,7 +128,10 @@ async function onClick() {
});
hasPendingFollowRequestFromYou.value = true;
- if ($i == null) return;
+ if ($i == null) {
+ wait.value = false;
+ return;
+ }
claimAchievement('following1');