graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 05:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor codes

Browse source
This commit is contained in:
Acid Chicken (硫酸鶏) 2020-04-29 05:30:58 +09:00
parent b862c055ae
commit 9daa900793
No known key found for this signature in database
GPG key ID: 5388F56C75B677A1
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/client/components/hcaptcha.vue
View file

@ -40,20 +40,12 @@ export default Vue.extend({
if (window.hcaptcha) { // loaded
this.available = true;
} else {
const alreadyLoading = document.getElementById('hcaptcha');
if (alreadyLoading) { // loading
alreadyLoading.addEventListener('load', () => this.available = true);
return;
} // init
const script = document.createElement('script');
script.addEventListener('load', () => this.available = true);
script.async = true;
script.id = 'hcaptcha';
script.src = 'https://hcaptcha.com/1/api.js?render=explicit';
document.head.appendChild(script);
(document.getElementById('hcaptcha') || (x => document.head.appendChild(Object.assign(x, {
async: true,
id: 'hcaptcha',
src: 'https://hcaptcha.com/1/api.js?render=explicit',
})))(document.createElement('script')))
.addEventListener('load', () => this.available = true);
}
},

3
src/client/pages/instance/settings.vue
View file

@ -371,11 +371,10 @@ export default Vue.extend({
}
if (recaptchaLoaded) { // loaded
delete window.onRecaptchaLoad;
renderRecaptchaPreview();
} else { // init
window.onRecaptchaLoad = () => {
recaptchaLoaded = true;
recaptchaLoaded = delete window.onRecaptchaLoad;
renderRecaptchaPreview();
};
const script = document.createElement('script');

2
src/server/api/private/signup.ts
View file

@ -14,7 +14,7 @@ export default async (ctx: Koa.Context) => {
// ただしテスト時はこの機構は障害となるため無効にする
if (process.env.NODE_ENV !== 'test' && instance.enableHcaptcha && instance.hcaptchaSecretKey) {
const success = await verify(instance.hcaptchaSecretKey, body['hcaptcha-response']).then(
({ 'error-codes': x }) => !x || !x.length,
({ success }) => success,
() => false,
);