summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-10-21 11:44:57 +0900
committerGitHub <noreply@github.com>2024-10-21 11:44:57 +0900
commitbc0c53b92b0ceba7617d9d02f54bbf7ccfc933d9 (patch)
tree0669ba8a792fd469c4cb69055128f2c4736e981d
parentfix(frontend): 通知の範囲指定が必要ない通知設定でも範囲... (diff)
downloadsharkey-bc0c53b92b0ceba7617d9d02f54bbf7ccfc933d9.tar.gz
sharkey-bc0c53b92b0ceba7617d9d02f54bbf7ccfc933d9.tar.bz2
sharkey-bc0c53b92b0ceba7617d9d02f54bbf7ccfc933d9.zip
fix(frontend): Captcha のエラーハンドリング (#14811)
* fix(frontend): Captcha のエラーハンドリングを修正 (MisskeyIO#768) (cherry picked from commit 88912d0f8c63a762fbb1d43e5c1abf4fd9fc05d4) * Update Changelog * typo --------- Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
-rw-r--r--CHANGELOG.md2
-rw-r--r--packages/frontend/src/components/MkCaptcha.vue4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04ae102227..c815e65ab3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/751)
- Enhance: ドライブでソートができるように
- Fix: 通知の範囲指定の設定項目が必要ない通知設定でも範囲指定の設定がでている問題を修正
+- Fix: Turnstileが失敗・期限切れした際にも成功扱いとなってしまう問題を修正
+ (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/768)
### Server
-
diff --git a/packages/frontend/src/components/MkCaptcha.vue b/packages/frontend/src/components/MkCaptcha.vue
index 82fc89e51c..264cf9af06 100644
--- a/packages/frontend/src/components/MkCaptcha.vue
+++ b/packages/frontend/src/components/MkCaptcha.vue
@@ -117,8 +117,8 @@ async function requestRender() {
sitekey: props.sitekey,
theme: defaultStore.state.darkMode ? 'dark' : 'light',
callback: callback,
- 'expired-callback': callback,
- 'error-callback': callback,
+ 'expired-callback': () => callback(undefined),
+ 'error-callback': () => callback(undefined),
});
} else if (props.provider === 'mcaptcha' && props.instanceUrl && props.sitekey) {
const { default: Widget } = await import('@mcaptcha/vanilla-glue');