Merge remote-tracking branch 'misskey-dev/develop' into io

This commit is contained in:
まっちゃとーにゅ 2024-05-04 12:34:38 +09:00
commit 1a243d8ae8
No known key found for this signature in database
GPG key ID: 6AFBBF529601C1DB
53 changed files with 2071 additions and 2004 deletions

View file

@ -4,8 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
<template>
<div v-if="meta">
<XSetup v-if="meta.requireSetup"/>
<div v-if="instance">
<XSetup v-if="instance.requireSetup"/>
<XEntrance v-else/>
</div>
</template>
@ -16,13 +16,13 @@ import * as Misskey from 'misskey-js';
import XSetup from './welcome.setup.vue';
import XEntrance from './welcome.entrance.special.vue';
import { instanceName } from '@/config.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { fetchInstance } from '@/instance.js';
const meta = ref<Misskey.entities.MetaResponse | null>(null);
const instance = ref<Misskey.entities.MetaDetailed | null>(null);
misskeyApi('meta', { detail: true }).then(res => {
meta.value = res;
fetchInstance(true).then((res) => {
instance.value = res;
});
const headerActions = computed(() => []);