From 9a611b24f3f03dcfe841ff30dd7ae273eda905df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Wed, 29 Apr 2020 09:35:37 +0900
Subject: [PATCH] Fix bug

---
 locales/ja-JP.yml                      |  2 +-
 src/client/pages/instance/settings.vue | 77 +++++++++++++-------------
 2 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 12b28019d9..f22a76917f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -308,7 +308,7 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHAを有効にする"
 recaptchaSiteKey: "サイトキー"
 recaptchaSecretKey: "シークレットキー"
-avoidMultiCaptchaConfirm: "単一のCaptchaのみの使用が推奨されます。他のCaptchaを無効にしますか？キャンセルして複数のCaptchaを有効化したままにすることも可能です。"
+avoidMultiCaptchaConfirm: "複数のCaptchaを使用すると干渉を起こす可能性があります。他のCaptchaを無効にしますか？キャンセルして複数のCaptchaを有効化したままにすることも可能です。"
 antennas: "アンテナ"
 manageAntennas: "アンテナの管理"
 name: "名前"
diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue
index f0fa846999..afd6d4cc6d 100644
--- a/src/client/pages/instance/settings.vue
+++ b/src/client/pages/instance/settings.vue
@@ -41,7 +41,7 @@
 	<section class="_card">
 		<div class="_title"><fa :icon="faShieldAlt"/> {{ $t('hcaptcha') }}</div>
 		<div class="_content">
-			<mk-switch v-model="enableHcaptcha" @input="guide('enableHcaptcha')">{{ $t('enableHcaptcha') }}</mk-switch>
+			<mk-switch v-model="enableHcaptcha" ref="enableHcaptcha">{{ $t('enableHcaptcha') }}</mk-switch>
 			<template v-if="enableHcaptcha">
 				<mk-input v-model="hcaptchaSiteKey" :disabled="!enableHcaptcha"><template #icon><fa :icon="faKey"/></template>{{ $t('hcaptchaSiteKey') }}</mk-input>
 				<mk-input v-model="hcaptchaSecretKey" :disabled="!enableHcaptcha"><template #icon><fa :icon="faKey"/></template>{{ $t('hcaptchaSecretKey') }}</mk-input>
@@ -59,7 +59,7 @@
 	<section class="_card">
 		<div class="_title"><fa :icon="faShieldAlt"/> {{ $t('recaptcha') }}</div>
 		<div class="_content">
-			<mk-switch v-model="enableRecaptcha" @input="guide('enableRecaptcha')">{{ $t('enableRecaptcha') }}</mk-switch>
+			<mk-switch v-model="enableRecaptcha" ref="enableRecaptcha">{{ $t('enableRecaptcha') }}</mk-switch>
 			<template v-if="enableRecaptcha">
 				<mk-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><template #icon><fa :icon="faKey"/></template>{{ $t('recaptchaSiteKey') }}</mk-input>
 				<mk-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><template #icon><fa :icon="faKey"/></template>{{ $t('recaptchaSecretKey') }}</mk-input>
@@ -348,44 +348,43 @@ export default Vue.extend({
 		}
 	},
 
+	mounted() {
+		this.$refs.enableHcaptcha.$on('change', () => {
+			if (this.enableHcaptcha && this.enableRecaptcha) {
+				this.$root.dialog({
+					type: 'question', // warning だと間違って cancel するかもしれない
+					showCancelButton: true,
+					title: this.$t('settingGuide'),
+					text: this.$t('avoidMultiCaptchaConfirm'),
+				}).then(({ canceled }) => {
+					if (canceled) {
+						return;
+					}
+
+					this.enableRecaptcha = false;
+				});
+			}
+		});
+
+		this.$refs.enableRecaptcha.$on('change', () => {
+			if (this.enableRecaptcha && this.enableHcaptcha) {
+				this.$root.dialog({
+					type: 'question', // warning だと間違って cancel するかもしれない
+					showCancelButton: true,
+					title: this.$t('settingGuide'),
+					text: this.$t('avoidMultiCaptchaConfirm'),
+				}).then(({ canceled }) => {
+					if (canceled) {
+						return;
+					}
+
+					this.enableHcaptcha = false;
+				});
+			}
+		});
+	},
+
 	methods: {
-		guide(key: 'enableHcaptcha' | 'enableRecaptcha') {
-			({
-				enableHcaptcha() {
-					if (this.enableHcaptcha && this.enableRecaptcha) {
-						this.$root.dialog({
-							type: 'question', // warning だと間違って cancel するかもしれない
-							showCancelButton: true,
-							title: this.$t('settingGuide'),
-							text: this.$t('avoidMultiCaptchaConfirm'),
-						}).then(({ canceled }) => {
-							if (canceled) {
-								return;
-							}
-
-							this.enableRecaptcha = false;
-						});
-					}
-				},
-				enableRecaptcha() {
-					if (this.enableRecaptcha && this.enableHcaptcha) {
-						this.$root.dialog({
-							type: 'question', // warning だと間違って cancel するかもしれない
-							showCancelButton: true,
-							title: this.$t('settingGuide'),
-							text: this.$t('avoidMultiCaptchaConfirm'),
-						}).then(({ canceled }) => {
-							if (canceled) {
-								return;
-							}
-
-							this.enableHcaptcha = false;
-						});
-					}
-				},
-			})[key]();
-		},
-
 		invite() {
 			this.$root.api('admin/invite').then(x => {
 				this.$root.dialog({