merge: upstream

This commit is contained in:
Marie 2024-01-09 02:57:57 +01:00
commit 7552cea69a
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
413 changed files with 5517 additions and 2309 deletions

View file

@ -31,6 +31,7 @@ import MkAnimBg from '@/components/MkAnimBg.vue';
import { login } from '@/account.js';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
const submitting = ref(false);
@ -42,7 +43,7 @@ function submit() {
if (submitting.value) return;
submitting.value = true;
os.api('signup-pending', {
misskeyApi('signup-pending', {
code: props.code,
}).then(res => {
if (res.pendingApproval) {