Merge a42c5e4534 into 794cb9ffe2

packages/frontend/.storybook/generate.tsx

@@ -412,8 +412,6 @@ function toStories(component: string): Promise<string> {
 		glob('src/components/MkFlashPreview.vue'),
 		glob('src/components/MkGalleryPostPreview.vue'),
 		glob('src/components/MkSignupServerRules.vue'),
-		glob('src/components/MkUserSetupDialog.vue'),
-		glob('src/components/MkUserSetupDialog.*.vue'),
 		glob('src/components/MkInstanceCardMini.vue'),
 		glob('src/components/MkInviteCode.vue'),
 		glob('src/pages/admin/overview.ap-requests.vue'),

packages/frontend/src/_boot_.ts

@@ -12,7 +12,7 @@ import '@/style.scss';
 import { mainBoot } from '@/boot/main-boot.js';
 import { subBoot } from '@/boot/sub-boot.js';
 
-const subBootPaths = ['/share', '/auth', '/miauth', '/oauth', '/signup-complete'];
+const subBootPaths = ['/share', '/auth', '/miauth', '/oauth', '/signup-complete', '/onboarding'];
 
 if (subBootPaths.some(i => location.pathname === i || location.pathname.startsWith(i + '/'))) {
 	subBoot();

packages/frontend/src/boot/common.ts

@@ -12,7 +12,7 @@ import components from '@/components/index.js';
 import { applyTheme } from '@/scripts/theme.js';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode.js';
 import { updateI18n, i18n } from '@/i18n.js';
-import { $i, refreshAccount, login } from '@/account.js';
+import { $i, iAmModerator, refreshAccount, login } from '@/account.js';
 import { defaultStore, ColdDeviceStorage } from '@/store.js';
 import { fetchInstance, instance } from '@/instance.js';
 import { deviceKind } from '@/scripts/device-kind.js';
@@ -21,6 +21,7 @@ import { getUrlWithoutLoginId } from '@/scripts/login-id.js';
 import { getAccountFromId } from '@/scripts/get-account-from-id.js';
 import { deckStore } from '@/ui/deck/deck-store.js';
 import { miLocalStorage } from '@/local-storage.js';
+import { claimedAchievements } from '@/scripts/achievements.js';
 import { fetchCustomEmojis } from '@/custom-emojis.js';
 import { setupRouter } from '@/router/main.js';
 import { createMainRouter } from '@/router/definition.js';
@@ -119,6 +120,26 @@ export async function common(createVue: () => App<Element>) {
 	await defaultStore.ready;
 	await deckStore.ready;
 
+	// 2024年10月1日JST以降に作成されたアカウントで、チュートリアルを完了していない通常ユーザーの場合、チュートリアルにリダイレクト
+	if (
+		!instance.canSkipInitialTutorial &&
+		$i &&
+		!iAmModerator &&
+		new Date($i.createdAt).getTime() >= 1727708400000 &&
+		!claimedAchievements.includes('tutorialCompleted') &&
+		!location.pathname.startsWith('/onboarding') &&
+		!location.pathname.startsWith('/signup-complete')
+	) {
+		await refreshAccount();
+
+		if ($i && !$i.achievements.map((v) => v.name).includes('tutorialCompleted')) {
+			const param = new URLSearchParams();
+			param.set('redirected_from', location.pathname + location.search + location.hash);
+			location.replace('/onboarding?' + param.toString());
+			return;
+		}
+	}
+
 	const fetchInstanceMetaPromise = fetchInstance();
 
 	fetchInstanceMetaPromise.then(() => {

packages/frontend/src/boot/main-boot.ts

@@ -111,14 +111,6 @@ export async function mainBoot() {
 	}
 
 	if ($i) {
-		defaultStore.loaded.then(() => {
-			if (defaultStore.state.accountSetupWizard !== -1) {
-				const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {
-					closed: () => dispose(),
-				});
-			}
-		});
-
 		for (const announcement of ($i.unreadAnnouncements ?? []).filter(x => x.display === 'dialog')) {
 			const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
 				announcement,

packages/frontend/src/components/MkPostForm.vue

@@ -539,6 +539,8 @@ function pushVisibleUser(user: Misskey.entities.UserDetailed) {
 }
 
 function addVisibleUser() {
+	if (props.mock) return;
+
 	os.selectUser().then(user => {
 		pushVisibleUser(user);
 
@@ -893,6 +895,8 @@ function cancel() {
 }
 
 function insertMention() {
+	if (props.mock) return;
+
 	os.selectUser({ localOnly: localOnly.value, includeSelf: true }).then(user => {
 		insertTextAtCursor(textareaEl.value, '@' + Misskey.acct.toString(user) + ' ');
 	});

packages/frontend/src/components/MkSignupDialog.form.vue

@@ -292,7 +292,7 @@ async function onSubmit(): Promise<void> {
 			emit('signup', resJson);
 
 			if (props.autoSet) {
-				await login(resJson.token);
+				await login(resJson.token, '/onboarding');
 			}
 		}
 	}

packages/frontend/src/components/MkTutorial.FollowUsers.vue

@@ -5,14 +5,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center;">{{ i18n.ts._initialAccountSetting.followUsers }}</div>
+	<div style="word-break: auto-phrase; text-align: center;">{{ i18n.ts._initialTutorial._followUsers.description1 }}<br>{{ i18n.ts._initialTutorial._followUsers.description2 }}</div>
 
 	<MkFolder :defaultOpen="true">
 		<template #label>{{ i18n.ts.recommended }}</template>
 
 		<MkPagination :pagination="pinnedUsers">
 			<template #default="{ items }">
-				<div :class="$style.users">
+				<div class="_gaps_s">
 					<XUser v-for="item in (items as Misskey.entities.UserDetailed[])" :key="item.id" :user="item"/>
 				</div>
 			</template>
@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<MkPagination :pagination="popularUsers">
 			<template #default="{ items }">
-				<div :class="$style.users">
+				<div class="_gaps_s">
 					<XUser v-for="item in (items as Misskey.entities.UserDetailed[])" :key="item.id" :user="item"/>
 				</div>
 			</template>
@@ -37,8 +37,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 import * as Misskey from 'misskey-js';
 import { i18n } from '@/i18n.js';
 import MkFolder from '@/components/MkFolder.vue';
-import XUser from '@/components/MkUserSetupDialog.User.vue';
+import XUser from '@/components/MkTutorial.FollowUsers.UserCard.vue';
 import MkPagination, { type Paging } from '@/components/MkPagination.vue';
+import type { TutorialPageCommonExpose } from '@/components/MkTutorial.vue';
 
 const pinnedUsers: Paging = {
 	endpoint: 'pinned-users',
@@ -56,13 +57,8 @@ const popularUsers: Paging = {
 		sort: '+follower',
 	},
 };
-</script>
 
-<style lang="scss" module>
-.users {
-	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(230px, 1fr));
-	grid-gap: var(--MI-margin);
-	justify-content: center;
-}
-</style>
+defineExpose<TutorialPageCommonExpose>({
+	canContinue: true,
+});
+</script>

packages/frontend/src/components/MkTutorial.Note.vue

@@ -5,8 +5,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div v-if="phase === 'aboutNote'" class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._note.description }}</div>
-	<MkNote :class="$style.exampleNoteRoot" style="pointer-events: none;" :note="exampleNote" :mock="true"/>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._note.description }}</div>
+	<MkNote tabindex="-1" :class="$style.exampleNoteRoot" style="pointer-events: none;" :note="exampleNote" :mock="true"/>
 	<div class="_gaps_s">
 		<div><i class="ti ti-arrow-back-up"></i> <b>{{ i18n.ts.reply }}</b> … {{ i18n.ts._initialTutorial._note.reply }}</div>
 		<div><i class="ti ti-repeat"></i> <b>{{ i18n.ts.renote }}</b> … {{ i18n.ts._initialTutorial._note.renote }}</div>
@@ -15,29 +15,30 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</div>
 </div>
 <div v-else-if="phase === 'howToReact'" class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._reaction.description }}</div>
+	<div class="_gaps_s">
+		<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._reaction.description }}</div>
+		<img :class="$style.image" src="/client-assets/tutorial/reaction.png"/>
+	</div>
 	<div>{{ i18n.ts._initialTutorial._reaction.letsTryReacting }}</div>
 	<MkNote :class="$style.exampleNoteRoot" :note="exampleNote" :mock="true" @reaction="addReaction" @removeReaction="removeReaction"/>
 	<div v-if="onceReacted"><b style="color: var(--MI_THEME-accent);"><i class="ti ti-check"></i> {{ i18n.ts._initialTutorial.wellDone }}</b> {{ i18n.ts._initialTutorial._reaction.reactNotification }}<br>{{ i18n.ts._initialTutorial._reaction.reactDone }}</div>
+	<div v-else><b :class="$style.actionWaitText">{{ i18n.ts._initialTutorial._reaction.reactToContinue }}</b></div>
 </div>
 </template>
 
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
-import { ref, reactive } from 'vue';
+import { ref, reactive, computed } from 'vue';
 import { i18n } from '@/i18n.js';
 import { globalEvents } from '@/events.js';
 import { $i } from '@/account.js';
 import MkNote from '@/components/MkNote.vue';
+import type { TutorialPageCommonExpose } from '@/components/MkTutorial.vue';
 
 const props = defineProps<{
 	phase: 'aboutNote' | 'howToReact';
 }>();
 
-const emit = defineEmits<{
-	(ev: 'reacted'): void;
-}>();
-
 const exampleNote = reactive<Misskey.entities.Note>({
 	id: '0000000000',
 	createdAt: '2019-04-14T17:30:49.181Z',
@@ -71,14 +72,27 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	replyId: null,
 	renoteId: null,
 });
+
 const onceReacted = ref<boolean>(false);
 
+const canContinue = computed(() => {
+	if (props.phase === 'aboutNote') {
+		return true;
+	} else if (props.phase === 'howToReact') {
+		return onceReacted.value;
+	}
+	return true;
+});
+
 function addReaction(emoji) {
 	onceReacted.value = true;
-	emit('reacted');
 	exampleNote.reactions[emoji] = 1;
 	exampleNote.myReaction = emoji;
-	doNotification(emoji);
+
+	// 通知音も鳴らしたいのでちょっと遅らせる
+	setTimeout(() => {
+		doNotification(emoji);
+	}, 200);
 }
 
 function doNotification(emoji: string): void {
@@ -101,6 +115,10 @@ function removeReaction(emoji) {
 	delete exampleNote.reactions[emoji];
 	exampleNote.myReaction = undefined;
 }
+
+defineExpose<TutorialPageCommonExpose>({
+	canContinue,
+});
 </script>
 
 <style lang="scss" module>
@@ -114,4 +132,14 @@ function removeReaction(emoji) {
 	height: 1px;
 	background: var(--MI_THEME-divider);
 }
+
+.image {
+	max-width: 300px;
+	margin: 0 auto;
+	border-radius: var(--MI-radius);
+}
+
+.actionWaitText {
+	color: var(--MI_THEME-error);
+}
 </style>

packages/frontend/src/components/MkTutorial.PostNote.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._postNote.description1 }}</div>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._postNote.description1 }}</div>
 	<MkPostForm :class="$style.exampleRoot" :mock="true" :autofocus="false"/>
 	<MkFormSection>
 		<template #label>{{ i18n.ts.visibility }}</template>
@@ -42,6 +42,7 @@ import MkNote from '@/components/MkNote.vue';
 import MkPostForm from '@/components/MkPostForm.vue';
 import MkFormSection from '@/components/form/section.vue';
 import MkInfo from '@/components/MkInfo.vue';
+import type { TutorialPageCommonExpose } from '@/components/MkTutorial.vue';
 
 const exampleCWNote = reactive<Misskey.entities.Note>({
 	id: '0000000000',
@@ -76,6 +77,10 @@ const exampleCWNote = reactive<Misskey.entities.Note>({
 	replyId: null,
 	renoteId: null,
 });
+
+defineExpose<TutorialPageCommonExpose>({
+	canContinue: true,
+});
 </script>
 
 <style lang="scss" module>

packages/frontend/src/components/MkTutorial.PrivacySettings.vue

@@ -0,0 +1,60 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div class="_gaps">
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._privacySettings.description1 }}</div>
+
+	<MkInfo>{{ i18n.ts._initialTutorial._privacySettings.theseSettingsCanEditLater }}</MkInfo>
+
+	<MkSwitch v-model="isLocked">{{ i18n.ts.makeFollowManuallyApprove }}<template #caption>{{ i18n.ts.lockedAccountInfo }}</template></MkSwitch>
+
+	<MkSwitch v-model="publicReactions">{{ i18n.ts.makeReactionsPublic }}<template #caption>{{ i18n.ts.makeReactionsPublicDescription }}</template></MkSwitch>
+
+	<MkSwitch v-model="hideOnlineStatus">{{ i18n.ts.hideOnlineStatus }}<template #caption>{{ i18n.ts.hideOnlineStatusDescription }}</template></MkSwitch>
+
+	<MkSwitch v-model="noCrawle">{{ i18n.ts.noCrawle }}<template #caption>{{ i18n.ts.noCrawleDescription }}</template></MkSwitch>
+
+	<MkSwitch v-model="preventAiLearning">{{ i18n.ts.preventAiLearning }}<template #caption>{{ i18n.ts.preventAiLearningDescription }}</template></MkSwitch>
+
+	<MkInfo>{{ i18n.ts._initialTutorial._privacySettings.youCanEditMoreSettingsInSettingsPageLater }}</MkInfo>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch } from 'vue';
+import { i18n } from '@/i18n.js';
+import MkSwitch from '@/components/MkSwitch.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { signinRequired } from '@/account.js';
+import type { TutorialPageCommonExpose } from '@/components/MkTutorial.vue';
+
+const $i = signinRequired();
+
+const isLocked = ref($i.isLocked);
+const publicReactions = ref($i.publicReactions);
+const hideOnlineStatus = ref($i.hideOnlineStatus);
+const noCrawle = ref($i.noCrawle);
+const preventAiLearning = ref($i.preventAiLearning);
+
+watch([isLocked, publicReactions, hideOnlineStatus, noCrawle, preventAiLearning], () => {
+	misskeyApi('i/update', {
+		isLocked: !!isLocked.value,
+		publicReactions: !!publicReactions.value,
+		hideOnlineStatus: !!hideOnlineStatus.value,
+		noCrawle: !!noCrawle.value,
+		preventAiLearning: !!preventAiLearning.value,
+	});
+});
+
+defineExpose<TutorialPageCommonExpose>({
+	canContinue: true,
+});
+</script>
+
+<style lang="scss" module>
+
+</style>

packages/frontend/src/components/MkTutorial.ProfileSettings.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<MkInfo>{{ i18n.ts._initialAccountSetting.theseSettingsCanEditLater }}</MkInfo>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._profileSettings.description }}</div>
 
 	<FormSlot>
 		<template #label>{{ i18n.ts.avatar }}</template>
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #label>{{ i18n.ts._profile.description }}</template>
 	</MkTextarea>
 
-	<MkInfo>{{ i18n.ts._initialAccountSetting.youCanEditMoreSettingsInSettingsPageLater }}</MkInfo>
+	<MkInfo>{{ i18n.ts._initialTutorial._profileSettings.youCanChangeThemLater }}</MkInfo>
 </div>
 </template>
 
@@ -37,9 +37,10 @@ import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 import FormSlot from '@/components/form/slot.vue';
 import MkInfo from '@/components/MkInfo.vue';
-import { chooseFileFromPc } from '@/scripts/select-file.js';
+import { selectFile } from '@/scripts/select-file.js';
 import * as os from '@/os.js';
-import { signinRequired } from '@/account.js';
+import { signinRequired, updateAccount } from '@/account.js';
+import type { TutorialPageCommonExpose } from '@/components/MkTutorial.vue';
 
 const $i = signinRequired();
 
@@ -57,6 +58,7 @@ watch(name, () => {
 			text: i18n.ts.yourNameContainsProhibitedWordsDescription,
 		},
 	});
+	updateAccount({ name: name.value });
 });
 
 watch(description, () => {
@@ -65,12 +67,11 @@ watch(description, () => {
 		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 		description: description.value || null,
 	});
+	updateAccount({ description: description.value });
 });
 
-function setAvatar(ev) {
-	chooseFileFromPc(false).then(async (files) => {
-		const file = files[0];
-
+function setAvatar(ev: MouseEvent) {
+	selectFile(ev.currentTarget ?? ev.target).then(async (file) => {
 		let originalOrCropped = file;
 
 		const { canceled } = await os.confirm({
@@ -89,10 +90,13 @@ function setAvatar(ev) {
 		const i = await os.apiWithDialog('i/update', {
 			avatarId: originalOrCropped.id,
 		});
-		$i.avatarId = i.avatarId;
-		$i.avatarUrl = i.avatarUrl;
+		updateAccount({ avatarId: i.avatarId, avatarUrl: i.avatarUrl });
 	});
 }
+
+defineExpose<TutorialPageCommonExpose>({
+	canContinue: true,
+});
 </script>
 
 <style lang="scss" module>
@@ -104,5 +108,6 @@ function setAvatar(ev) {
 .avatar {
 	width: 100px;
 	height: 100px;
+	background: var(--MI_THEME-bg);
 }
 </style>

packages/frontend/src/components/MkTutorial.Sensitive.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.description }}</div>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.description }}</div>
 	<div>{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.tryThisFile }}</div>
 	<MkInfo>{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.method }}</MkInfo>
 	<MkPostForm
@@ -16,6 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		@fileChangeSensitive="doSucceeded"
 	></MkPostForm>
 	<div v-if="onceSucceeded"><b style="color: var(--MI_THEME-accent);"><i class="ti ti-check"></i> {{ i18n.ts._initialTutorial.wellDone }}</b> {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.sensitiveSucceeded }}</div>
+	<div v-else><b :class="$style.actionWaitText">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.doItToContinue }}</b></div>
 	<MkFolder>
 		<template #label>{{ i18n.ts.previewNoteText }}</template>
 		<MkNote :mock="true" :note="exampleNote" :class="$style.exampleRoot"></MkNote>
@@ -32,17 +33,13 @@ import MkFolder from '@/components/MkFolder.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import MkNote from '@/components/MkNote.vue';
 import { $i } from '@/account.js';
-
-const emit = defineEmits<{
-	(ev: 'succeeded'): void;
-}>();
+import type { TutorialPageCommonExpose } from '@/components/MkTutorial.vue';
 
 const onceSucceeded = ref<boolean>(false);
 
 function doSucceeded(fileId: string, to: boolean) {
 	if (fileId === exampleNote.fileIds?.[0] && to) {
 		onceSucceeded.value = true;
-		emit('succeeded');
 	}
 }
 
@@ -87,6 +84,9 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	renoteId: null,
 });
 
+defineExpose<TutorialPageCommonExpose>({
+	canContinue: onceSucceeded,
+});
 </script>
 
 <style lang="scss" module>
@@ -143,4 +143,8 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	position: relative;
 	line-height: 40px;
 }
+
+.actionWaitText {
+	color: var(--MI_THEME-error);
+}
 </style>

packages/frontend/src/components/MkTutorial.Timeline.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._timeline.description1 }}</div>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._timeline.description1 }}</div>
 	<div class="_gaps_s">
 		<div v-for="tl in basicTimelineTypes">
 			<i :class="basicTimelineIconClass(tl)"></i> <b>{{ i18n.ts._timelines[tl] }}</b> … {{ i18n.ts._initialTutorial._timeline[tl] }}
@@ -27,6 +27,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script setup lang="ts">
 import { i18n } from '@/i18n.js';
 import { basicTimelineIconClass, basicTimelineTypes } from '@/timelines.js';
+import type { TutorialPageCommonExpose } from '@/components/MkTutorial.vue';
+
+defineExpose<TutorialPageCommonExpose>({
+	canContinue: true,
+});
 </script>
 
 <style lang="scss" module>

packages/frontend/src/components/MkTutorial.vue

@@ -0,0 +1,439 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.tutorialRoot">
+	<div v-if="showProgressbar" :class="$style.progressBar">
+		<div :class="$style.progressBarValue" :style="{ width: `${(page / MAX_PAGE) * 100}%` }"></div>
+	</div>
+	<div v-if="showProgressbar && page !== 0 && page !== MAX_PAGE" :class="$style.progressText">{{ page }}/{{ MAX_PAGE }}</div>
+	<div :class="$style.tutorialMain">
+		<Transition
+			mode="out-in"
+			:enterActiveClass="$style.transition_x_enterActive"
+			:leaveActiveClass="$style.transition_x_leaveActive"
+			:enterFromClass="$style.transition_x_enterFrom"
+			:leaveToClass="$style.transition_x_leaveTo"
+
+			@beforeLeave="areButtonsLocked = true"
+			@afterEnter="areButtonsLocked = false"
+		>
+			<slot v-if="page === 0" key="tutorialPage_0" name="welcome" :close="() => emit('close', true)" :next="next">
+				<div :class="$style.centerPage">
+					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
+					<MkSpacer :marginMin="20" :marginMax="28">
+						<div class="_gaps" style="text-align: center;">
+							<i class="ti ti-confetti" style="display: block; margin: auto; font-size: 3em; color: var(--MI_THEME-accent);"></i>
+							<div style="font-size: 120%;">{{ i18n.ts._initialTutorial._landing.title }}</div>
+							<div>{{ i18n.ts._initialTutorial._landing.description }}</div>
+							<MkButton primary rounded gradate style="margin: 16px auto 0 auto;" data-cy-user-setup-start @click="next">{{ i18n.ts._initialTutorial.launchTutorial }} <i class="ti ti-arrow-right"></i></MkButton>
+							<MkButton v-if="skippable" style="margin: 0 auto;" transparent rounded data-cy-user-setup-close @click="emit('close', true)">{{ i18n.ts.close }}</MkButton>
+						</div>
+					</MkSpacer>
+				</div>
+			</slot>
+			<slot v-else-if="page === MAX_PAGE" :key="`tutorialPage_${MAX_PAGE}`" name="finish" :close="() => emit('close')" :prev="prev">
+				<div :class="$style.centerPage">
+					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
+					<MkSpacer :marginMin="20" :marginMax="28">
+						<div class="_gaps">
+							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--MI_THEME-accent);"></i>
+							<div style="text-align: center; font-size: 120%;">{{ i18n.ts._initialTutorial._done.title }}</div>
+							<I18n :src="i18n.ts._initialTutorial._done.description" tag="div" style="text-align: center; padding: 0 16px;">
+								<template #link>
+									<a href="https://misskey-hub.net/docs/for-users/" target="_blank" class="_link">{{ i18n.ts.help }}</a>
+								</template>
+							</I18n>
+							<div style="text-align: center;">{{ i18n.ts._initialTutorial._done.youCanReferTutorialBy }}</div>
+							<div style="text-align: center;">{{ i18n.tsx._initialTutorial._done.haveFun({ name: instance.name ?? host }) }}</div>
+							<div class="_buttonsCenter" style="margin-top: 16px;">
+								<MkButton rounded @click="prev"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
+								<MkButton rounded primary gradate @click="emit('close')">{{ i18n.ts.close }}</MkButton>
+							</div>
+						</div>
+					</MkSpacer>
+				</div>
+			</slot>
+			<div v-else :key="`tutorialPage_${page}`" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<component
+							:is="componentsDef[page - 1].component"
+							ref="tutorialPageEl"
+							v-bind="componentsDef[page - 1].props"
+						/>
+					</MkSpacer>
+				</div>
+			</div>
+		</Transition>
+	</div>
+	<div :class="[$style.pageFooter, { [$style.pageFooterShown]: (page > 0 && page < MAX_PAGE) }]" :inert="(page <= 0 && page >= MAX_PAGE)">
+		<div class="_buttonsCenter">
+			<MkButton v-if="initialPage !== page" :disabled="areButtonsLocked" rounded @click="prev"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
+			<MkButton primary rounded gradate :disabled="!canContinue" data-cy-user-setup-next @click="next">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import type { Ref } from 'vue';
+import { i18n } from '@/i18n.js';
+
+/**
+ * 【ページの足し方】
+ *
+ * 1. ページコンポーネントを作成
+ *    このとき、TutorialPageCommonExposeを実装すること
+ *    （canContinueを変化させることで、次へボタンが押されるのをブロックできます。ギミックがないページはtrueでOK。）
+ * 2. tutorialBodyPagesDefにページのアイコン・タイトル・区分を追加
+ *    （区分がsetupの場合はwithSetup == falseのときにスキップされます）
+ * 3. componentsDefにページのコンポーネントを追加（順番を対応させること）
+ * 4. cypress/e2e/basic.cy.tsにページ分のテストを追加
+ */
+
+/** チュートリアルページ用Expose */
+export type TutorialPageCommonExpose = {
+	canContinue: boolean | Ref<boolean>;
+};
+
+/** ページ メタデータ */
+export type TutorialPage = {
+	icon?: string;
+	type: 'tutorial' | 'setup';
+	title: string;
+};
+
+/**
+ * はじめと終わり以外のページ メタデータ
+ *
+ * （コンポーネントはsetup内で定義しています）
+ */
+export const tutorialBodyPagesDef = [{
+	icon: 'ti ti-user',
+	type: 'setup',
+	title: i18n.ts._initialTutorial._profileSettings.title,
+}, {
+	icon: 'ti ti-pencil',
+	type: 'tutorial',
+	title: i18n.ts._initialTutorial._note.title,
+}, {
+	icon: 'ti ti-mood-smile',
+	type: 'tutorial',
+	title: i18n.ts._initialTutorial._reaction.title,
+}, {
+	icon: 'ti ti-home',
+	type: 'tutorial',
+	title: i18n.ts._initialTutorial._timeline.title,
+}, {
+	icon: 'ti ti-user',
+	type: 'setup',
+	title: i18n.ts.follow,
+}, {
+	icon: 'ti ti-pencil-plus',
+	type: 'tutorial',
+	title: i18n.ts._initialTutorial._postNote.title,
+}, {
+	icon: 'ti ti-eye-exclamation',
+	type: 'tutorial',
+	title: i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.title,
+}, {
+	icon: 'ti ti-lock',
+	type: 'setup',
+	title: i18n.ts._initialTutorial._privacySettings.title,
+}] as const satisfies TutorialPage[];
+
+export const MAX_PAGE = tutorialBodyPagesDef.length + 1; // 0始まりにするために +2 - 1 = +1
+</script>
+
+<script lang="ts" setup>
+import { ref, shallowRef, isRef, computed, watch } from 'vue';
+import MkButton from '@/components/MkButton.vue';
+import XProfileSettings from '@/components/MkTutorial.ProfileSettings.vue';
+import XNote from '@/components/MkTutorial.Note.vue';
+import XTimeline from '@/components/MkTutorial.Timeline.vue';
+import XFollowUsers from '@/components/MkTutorial.FollowUsers.vue';
+import XPostNote from '@/components/MkTutorial.PostNote.vue';
+import XSensitive from '@/components/MkTutorial.Sensitive.vue';
+import XPrivacySettings from '@/components/MkTutorial.PrivacySettings.vue';
+import MkAnimBg from '@/components/MkAnimBg.vue';
+import { instance } from '@/instance.js';
+import { host } from '@@/js/config.js';
+import { claimAchievement } from '@/scripts/achievements.js';
+
+import type { Component } from 'vue';
+import type { Tuple } from '@/type.js';
+
+const props = defineProps<{
+	initialPage?: number;
+	showProgressbar?: boolean;
+	skippable?: boolean;
+	withSetup?: boolean;
+}>();
+
+const emit = defineEmits<{
+	(ev: 'pageChanged', to: number): void;
+	(ev: 'close', withConfirm?: boolean): void;
+}>();
+
+// テストの場合は全インタラクションをスキップする
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-expect-error
+const isTest = (import.meta.env.MODE === 'test' || window.Cypress != null);
+
+type ComponentDef = {
+	component: Component;
+	props?: Record<string, unknown>;
+};
+
+/**
+ * はじめと終わり以外のページ コンポーネント
+ *
+ * （メタデータは上の方で定義しています）
+ */
+const componentsDef: Tuple<ComponentDef, typeof tutorialBodyPagesDef.length> = [
+	{ component: XProfileSettings },
+	{ component: XNote, props: { phase: 'aboutNote' } },
+	{ component: XNote, props: { phase: 'howToReact' } },
+	{ component: XTimeline },
+	{ component: XFollowUsers },
+	{ component: XPostNote },
+	{ component: XSensitive },
+	{ component: XPrivacySettings },
+];
+
+// eslint-disable-next-line vue/no-setup-props-destructure
+const page = ref(props.initialPage ?? 0);
+
+const currentPageDef = computed(() => {
+	if (page.value > 0 && page.value < MAX_PAGE) {
+		return tutorialBodyPagesDef[page.value - 1] ?? null;
+	} else {
+		return null;
+	}
+});
+
+watch(page, (to) => {
+	if (to === MAX_PAGE) {
+		claimAchievement('tutorialCompleted');
+	}
+});
+
+// ページコンポーネントのexposeを受け取る
+const tutorialPageEl = shallowRef<TutorialPageCommonExpose | null>(null);
+
+// トランジション中に連打されて進んじゃうのを防ぐ
+const areButtonsLocked = ref(false);
+
+const canContinue = computed(() => {
+	if (isTest) {
+		return true;
+	}
+
+	if (areButtonsLocked.value) {
+		return false;
+	}
+
+	if (tutorialPageEl.value) {
+		if (isRef(tutorialPageEl.value.canContinue)) {
+			return tutorialPageEl.value.canContinue.value;
+		} else {
+			return tutorialPageEl.value.canContinue;
+		}
+	} else {
+		return true;
+	}
+});
+
+function findNextPage(type: TutorialPage['type']) {
+	const bodyPagesDefIndex = page.value - 1;
+
+	for (let i = bodyPagesDefIndex + 1; i < tutorialBodyPagesDef.length; i++) {
+		if (tutorialBodyPagesDef[i] == null) {
+			break;
+		}
+
+		if (tutorialBodyPagesDef[i].type === type) {
+			return i + 1; // はじめの1ページ分足す
+		}
+	}
+
+	return MAX_PAGE;
+}
+
+function findPrevPage(type: TutorialPage['type']) {
+	const bodyPagesDefIndex = page.value - 1;
+
+	for (let i = bodyPagesDefIndex - 1; i >= 0; i--) {
+		if (tutorialBodyPagesDef[i] == null) {
+			break;
+		}
+
+		if (tutorialBodyPagesDef[i].type === type) {
+			return i + 1; // はじめの1ページ分足す
+		}
+	}
+
+	return 0;
+}
+
+function next() {
+	if (areButtonsLocked.value) {
+		return;
+	} else {
+		areButtonsLocked.value = true;
+	}
+
+	const bodyPagesDefIndex = page.value - 1;
+
+	if (!props.withSetup && tutorialBodyPagesDef[bodyPagesDefIndex + 1].type !== 'tutorial') {
+		page.value = findNextPage('tutorial');
+	} else {
+		page.value = Math.min(page.value + 1, MAX_PAGE);
+	}
+
+	emit('pageChanged', page.value);
+}
+
+function prev() {
+	if (areButtonsLocked.value) {
+		return;
+	} else {
+		areButtonsLocked.value = true;
+	}
+
+	const bodyPagesDefIndex = page.value - 1;
+
+	if (!props.withSetup && tutorialBodyPagesDef[bodyPagesDefIndex - 1].type !== 'tutorial') {
+		page.value = findPrevPage('tutorial');
+	} else {
+		page.value = Math.max(page.value - 1, 0);
+	}
+
+	emit('pageChanged', page.value);
+}
+
+defineExpose({
+	page,
+	currentPageDef,
+});
+</script>
+
+<style lang="scss" module>
+.tutorialRoot {
+	position: relative;
+	box-sizing: border-box;
+	overflow: hidden;
+	width: 100%;
+	height: 100%;
+}
+
+.tutorialMain {
+	position: relative;
+	width: 100%;
+	height: 100%;
+}
+
+.progressBar {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 10;
+	width: 100%;
+	height: 4px;
+}
+
+.progressBarValue {
+	height: 100%;
+	background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
+	transition: all 0.5s cubic-bezier(0,.5,.5,1);
+}
+
+.progressText {
+	position: absolute;
+	top: 1em;
+	right: 1em;
+	font-size: 0.8em;
+	opacity: 0.7;
+	pointer-events: none;
+}
+
+.transition_x_enterActive,
+.transition_x_leaveActive {
+	transition: opacity 0.3s cubic-bezier(0,0,.35,1), transform 0.3s cubic-bezier(0,0,.35,1);
+}
+.transition_x_enterFrom {
+	opacity: 0;
+	transform: translateX(50px);
+}
+.transition_x_leaveTo {
+	opacity: 0;
+	transform: translateX(-50px);
+}
+
+.progressBar {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 10;
+	width: 100%;
+	height: 4px;
+}
+
+.progressBarValue {
+	height: 100%;
+	background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
+	transition: all 0.5s cubic-bezier(0,.5,.5,1);
+}
+
+.centerPage {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100%;
+	box-sizing: border-box;
+}
+
+.pageContainer {
+	width: 100%;
+	height: 100%;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+.pageRoot {
+	display: flex;
+	flex-direction: column;
+	min-height: 100%;
+}
+
+.pageMain {
+	flex-grow: 1;
+	line-height: 1.5;
+	margin-bottom: 56px;
+}
+
+.pageFooter {
+	position: sticky;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 56px;
+	box-sizing: border-box;
+	flex-shrink: 0;
+	padding: 12px;
+	border-top: solid 0.5px var(--MI_THEME-divider);
+	background: var(--MI_THEME-acrylicBg);
+
+	transition: transform 0.3s cubic-bezier(0,0,.35,1);
+	transform: translateY(100%);
+	visibility: hidden;
+
+	&.pageFooterShown {
+		transform: translateY(0);
+		visibility: visible;
+	}
+}
+</style>

packages/frontend/src/components/MkTutorialDialog.vue

@@ -11,158 +11,29 @@ SPDX-License-Identifier: AGPL-3.0-only
 	@close="close(true)"
 	@closed="emit('closed')"
 >
-	<template v-if="page === 1" #header><i class="ti ti-pencil"></i> {{ i18n.ts._initialTutorial._note.title }}</template>
-	<template v-else-if="page === 2" #header><i class="ti ti-mood-smile"></i> {{ i18n.ts._initialTutorial._reaction.title }}</template>
-	<template v-else-if="page === 3" #header><i class="ti ti-home"></i> {{ i18n.ts._initialTutorial._timeline.title }}</template>
-	<template v-else-if="page === 4" #header><i class="ti ti-pencil-plus"></i> {{ i18n.ts._initialTutorial._postNote.title }}</template>
-	<template v-else-if="page === 5" #header><i class="ti ti-eye-exclamation"></i> {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.title }}</template>
+	<template v-if="tutorialEl?.currentPageDef" #header>
+		<i v-if="tutorialEl.currentPageDef.icon" :class="tutorialEl.currentPageDef.icon"></i>
+		{{ tutorialEl.currentPageDef.title }}
+	</template>
 	<template v-else #header>{{ i18n.ts._initialTutorial.title }}</template>
 
-	<div style="overflow-x: clip;">
-		<Transition
-			mode="out-in"
-			:enterActiveClass="$style.transition_x_enterActive"
-			:leaveActiveClass="$style.transition_x_leaveActive"
-			:enterFromClass="$style.transition_x_enterFrom"
-			:leaveToClass="$style.transition_x_leaveTo"
-		>
-			<template v-if="page === 0">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-confetti" style="display: block; margin: auto; font-size: 3em; color: var(--MI_THEME-accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialTutorial._landing.title }}</div>
-							<div>{{ i18n.ts._initialTutorial._landing.description }}</div>
-							<MkButton primary rounded gradate style="margin: 16px auto 0 auto;" @click="page++">{{ i18n.ts._initialTutorial.launchTutorial }} <i class="ti ti-arrow-right"></i></MkButton>
-							<MkButton style="margin: 0 auto;" transparent rounded @click="close(true)">{{ i18n.ts.close }}</MkButton>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-			<template v-else-if="page === 1">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XNote phase="aboutNote"/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 1" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 2">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<div class="_gaps">
-								<XNote phase="howToReact" @reacted="isReactionTutorialPushed = true"/>
-								<div v-if="!isReactionTutorialPushed">{{ i18n.ts._initialTutorial._reaction.reactToContinue }}</div>
-							</div>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 2" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate :disabled="!isReactionTutorialPushed" @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 3">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XTimeline/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 3" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 4">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XPostNote/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 3" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 5">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<div class="_gaps">
-								<XSensitive @succeeded="isSensitiveTutorialSucceeded = true"/>
-								<div v-if="!isSensitiveTutorialSucceeded">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.doItToContinue }}</div>
-							</div>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 2" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate :disabled="!isSensitiveTutorialSucceeded" @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 6">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--MI_THEME-accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialTutorial._done.title }}</div>
-							<I18n :src="i18n.ts._initialTutorial._done.description" tag="div" style="padding: 0 16px;">
-								<template #link>
-									<a href="https://misskey-hub.net/docs/for-users/" target="_blank" class="_link">{{ i18n.ts.help }}</a>
-								</template>
-							</I18n>
-							<div>{{ i18n.tsx._initialAccountSetting.haveFun({ name: instance.name ?? host }) }}</div>
-							<div class="_buttonsCenter" style="margin-top: 16px;">
-								<MkButton v-if="initialPage !== 4" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton rounded primary gradate @click="close(false)">{{ i18n.ts.close }}</MkButton>
-							</div>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-		</Transition>
-	</div>
+	<XTutorial
+		ref="tutorialEl"
+		:initialPage="initialPage"
+		:skippable="true"
+		@close="close"
+	/>
 </MkModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { ref, shallowRef, watch } from 'vue';
+import { shallowRef } from 'vue';
 import MkModalWindow from '@/components/MkModalWindow.vue';
-import MkButton from '@/components/MkButton.vue';
-import XNote from '@/components/MkTutorialDialog.Note.vue';
-import XTimeline from '@/components/MkTutorialDialog.Timeline.vue';
-import XPostNote from '@/components/MkTutorialDialog.PostNote.vue';
-import XSensitive from '@/components/MkTutorialDialog.Sensitive.vue';
-import MkAnimBg from '@/components/MkAnimBg.vue';
+import XTutorial from '@/components/MkTutorial.vue';
 import { i18n } from '@/i18n.js';
-import { instance } from '@/instance.js';
-import { host } from '@@/js/config.js';
-import { claimAchievement } from '@/scripts/achievements.js';
 import * as os from '@/os.js';
 
-const props = defineProps<{
+defineProps<{
 	initialPage?: number;
 }>();
 
@@ -172,20 +43,9 @@ const emit = defineEmits<{
 
 const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
 
-// eslint-disable-next-line vue/no-setup-props-reactivity-loss
-const page = ref(props.initialPage ?? 0);
+const tutorialEl = shallowRef<InstanceType<typeof XTutorial>>();
 
-watch(page, (to) => {
-	// チュートリアルの枚数を増やしたら必ず変更すること！！
-	if (to === 6) {
-		claimAchievement('tutorialCompleted');
-	}
-});
-
-const isReactionTutorialPushed = ref<boolean>(false);
-const isSensitiveTutorialSucceeded = ref<boolean>(false);
-
-async function close(skip: boolean) {
+async function close(skip?: boolean) {
 	if (skip) {
 		const { canceled } = await os.confirm({
 			type: 'warning',

packages/frontend/src/components/MkUserSetupDialog.Follow.stories.impl.ts

@@ -1,56 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import { HttpResponse, http } from 'msw';
-import { commonHandlers } from '../../.storybook/mocks.js';
-import { userDetailed } from '../../.storybook/fakes.js';
-import MkUserSetupDialog_Follow from './MkUserSetupDialog.Follow.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_Follow,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_Follow v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-		msw: {
-			handlers: [
-				...commonHandlers,
-				http.post('/api/users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-				http.post('/api/pinned-users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-			],
-		},
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_Follow>;

packages/frontend/src/components/MkUserSetupDialog.Privacy.stories.impl.ts

@@ -1,36 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import MkUserSetupDialog_Privacy from './MkUserSetupDialog.Privacy.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_Privacy,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_Privacy v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_Privacy>;

packages/frontend/src/components/MkUserSetupDialog.Privacy.vue

@@ -1,71 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div class="_gaps">
-	<MkInfo>{{ i18n.ts._initialAccountSetting.theseSettingsCanEditLater }}</MkInfo>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.makeFollowManuallyApprove }}</template>
-		<template #icon><i class="ti ti-lock"></i></template>
-		<template #suffix>{{ isLocked ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="isLocked">{{ i18n.ts.makeFollowManuallyApprove }}<template #caption>{{ i18n.ts.lockedAccountInfo }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.hideOnlineStatus }}</template>
-		<template #icon><i class="ti ti-eye-off"></i></template>
-		<template #suffix>{{ hideOnlineStatus ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="hideOnlineStatus">{{ i18n.ts.hideOnlineStatus }}<template #caption>{{ i18n.ts.hideOnlineStatusDescription }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.noCrawle }}</template>
-		<template #icon><i class="ti ti-world-x"></i></template>
-		<template #suffix>{{ noCrawle ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="noCrawle">{{ i18n.ts.noCrawle }}<template #caption>{{ i18n.ts.noCrawleDescription }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.preventAiLearning }}</template>
-		<template #icon><i class="ti ti-photo-shield"></i></template>
-		<template #suffix>{{ preventAiLearning ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="preventAiLearning">{{ i18n.ts.preventAiLearning }}<template #caption>{{ i18n.ts.preventAiLearningDescription }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkInfo>{{ i18n.ts._initialAccountSetting.youCanEditMoreSettingsInSettingsPageLater }}</MkInfo>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { ref, watch } from 'vue';
-import { i18n } from '@/i18n.js';
-import MkSwitch from '@/components/MkSwitch.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import { misskeyApi } from '@/scripts/misskey-api.js';
-
-const isLocked = ref(false);
-const hideOnlineStatus = ref(false);
-const noCrawle = ref(false);
-const preventAiLearning = ref(true);
-
-watch([isLocked, hideOnlineStatus, noCrawle, preventAiLearning], () => {
-	misskeyApi('i/update', {
-		isLocked: !!isLocked.value,
-		hideOnlineStatus: !!hideOnlineStatus.value,
-		noCrawle: !!noCrawle.value,
-		preventAiLearning: !!preventAiLearning.value,
-	});
-});
-</script>
-
-<style lang="scss" module>
-
-</style>

packages/frontend/src/components/MkUserSetupDialog.Profile.stories.impl.ts

@@ -1,36 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import MkUserSetupDialog_Profile from './MkUserSetupDialog.Profile.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_Profile,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_Profile v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_Profile>;

packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts

@@ -1,37 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import { userDetailed } from '../../.storybook/fakes.js';
-import MkUserSetupDialog_User from './MkUserSetupDialog.User.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_User,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_User v-bind="props" />',
-		};
-	},
-	args: {
-		user: userDetailed(),
-	},
-	parameters: {
-		layout: 'centered',
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_User>;

packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts

@@ -1,56 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import { HttpResponse, http } from 'msw';
-import { commonHandlers } from '../../.storybook/mocks.js';
-import { userDetailed } from '../../.storybook/fakes.js';
-import MkUserSetupDialog from './MkUserSetupDialog.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-		msw: {
-			handlers: [
-				...commonHandlers,
-				http.post('/api/users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-				http.post('/api/pinned-users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-			],
-		},
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog>;

packages/frontend/src/components/MkUserSetupDialog.vue

@@ -1,259 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<MkModalWindow
-	ref="dialog"
-	:width="500"
-	:height="550"
-	data-cy-user-setup
-	@close="close(true)"
-	@closed="emit('closed')"
->
-	<template v-if="page === 1" #header><i class="ti ti-user-edit"></i> {{ i18n.ts._initialAccountSetting.profileSetting }}</template>
-	<template v-else-if="page === 2" #header><i class="ti ti-lock"></i> {{ i18n.ts._initialAccountSetting.privacySetting }}</template>
-	<template v-else-if="page === 3" #header><i class="ti ti-user-plus"></i> {{ i18n.ts.follow }}</template>
-	<template v-else-if="page === 4" #header><i class="ti ti-bell-plus"></i> {{ i18n.ts.pushNotification }}</template>
-	<template v-else-if="page === 5" #header>{{ i18n.ts.done }}</template>
-	<template v-else #header>{{ i18n.ts.initialAccountSetting }}</template>
-
-	<div style="overflow-x: clip;">
-		<div :class="$style.progressBar">
-			<div :class="$style.progressBarValue" :style="{ width: `${(page / 5) * 100}%` }"></div>
-		</div>
-		<Transition
-			mode="out-in"
-			:enterActiveClass="$style.transition_x_enterActive"
-			:leaveActiveClass="$style.transition_x_leaveActive"
-			:enterFromClass="$style.transition_x_enterFrom"
-			:leaveToClass="$style.transition_x_leaveTo"
-		>
-			<template v-if="page === 0">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-confetti" style="display: block; margin: auto; font-size: 3em; color: var(--MI_THEME-accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialAccountSetting.accountCreated }}</div>
-							<div>{{ i18n.ts._initialAccountSetting.letsStartAccountSetup }}</div>
-							<MkButton primary rounded gradate style="margin: 16px auto 0 auto;" data-cy-user-setup-continue @click="page++">{{ i18n.ts._initialAccountSetting.profileSetting }} <i class="ti ti-arrow-right"></i></MkButton>
-							<MkButton style="margin: 0 auto;" transparent rounded @click="later(true)">{{ i18n.ts.later }}</MkButton>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-			<template v-else-if="page === 1">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XProfile/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate data-cy-user-setup-continue @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 2">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XPrivacy/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate data-cy-user-setup-continue @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 3">
-				<div style="height: 100cqh; overflow: auto;">
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<XFollow/>
-					</MkSpacer>
-					<div :class="$style.pageFooter">
-						<div class="_buttonsCenter">
-							<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-							<MkButton primary rounded gradate style="" data-cy-user-setup-continue @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 4">
-				<div :class="$style.centerPage">
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-bell-ringing-2" style="display: block; margin: auto; font-size: 3em; color: var(--MI_THEME-accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts.pushNotification }}</div>
-							<div style="padding: 0 16px;">{{ i18n.tsx._initialAccountSetting.pushNotificationDescription({ name: instance.name ?? host }) }}</div>
-							<MkPushNotificationAllowButton primary showOnlyToRegister style="margin: 0 auto;"/>
-							<div class="_buttonsCenter" style="margin-top: 16px;">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate data-cy-user-setup-continue @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-			<template v-else-if="page === 5">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--MI_THEME-accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialAccountSetting.initialAccountSettingCompleted }}</div>
-							<div>{{ i18n.tsx._initialAccountSetting.youCanContinueTutorial({ name: instance.name ?? host }) }}</div>
-							<div class="_buttonsCenter" style="margin-top: 16px;">
-								<MkButton rounded primary gradate data-cy-user-setup-continue @click="launchTutorial()">{{ i18n.ts._initialAccountSetting.startTutorial }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-							<div class="_buttonsCenter">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton rounded primary data-cy-user-setup-continue @click="setupComplete()">{{ i18n.ts.close }}</MkButton>
-							</div>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-		</Transition>
-	</div>
-</MkModalWindow>
-</template>
-
-<script lang="ts" setup>
-import { ref, shallowRef, watch, nextTick, defineAsyncComponent } from 'vue';
-import MkModalWindow from '@/components/MkModalWindow.vue';
-import MkButton from '@/components/MkButton.vue';
-import XProfile from '@/components/MkUserSetupDialog.Profile.vue';
-import XFollow from '@/components/MkUserSetupDialog.Follow.vue';
-import XPrivacy from '@/components/MkUserSetupDialog.Privacy.vue';
-import MkAnimBg from '@/components/MkAnimBg.vue';
-import { i18n } from '@/i18n.js';
-import { instance } from '@/instance.js';
-import { host } from '@@/js/config.js';
-import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
-import { defaultStore } from '@/store.js';
-import * as os from '@/os.js';
-
-const emit = defineEmits<{
-	(ev: 'closed'): void;
-}>();
-
-const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
-
-// eslint-disable-next-line vue/no-setup-props-reactivity-loss
-const page = ref(defaultStore.state.accountSetupWizard);
-
-watch(page, () => {
-	defaultStore.set('accountSetupWizard', page.value);
-});
-
-async function close(skip: boolean) {
-	if (skip) {
-		const { canceled } = await os.confirm({
-			type: 'warning',
-			text: i18n.ts._initialAccountSetting.skipAreYouSure,
-		});
-		if (canceled) return;
-	}
-
-	dialog.value?.close();
-	defaultStore.set('accountSetupWizard', -1);
-}
-
-function setupComplete() {
-	defaultStore.set('accountSetupWizard', -1);
-	dialog.value?.close();
-}
-
-function launchTutorial() {
-	setupComplete();
-	nextTick(() => {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {
-			initialPage: 1,
-		}, {
-			closed: () => dispose(),
-		});
-	});
-}
-
-async function later(later: boolean) {
-	if (later) {
-		const { canceled } = await os.confirm({
-			type: 'warning',
-			text: i18n.ts._initialAccountSetting.laterAreYouSure,
-		});
-		if (canceled) return;
-	}
-
-	dialog.value?.close();
-	defaultStore.set('accountSetupWizard', 0);
-}
-</script>
-
-<style lang="scss" module>
-.transition_x_enterActive,
-.transition_x_leaveActive {
-	transition: opacity 0.3s cubic-bezier(0,0,.35,1), transform 0.3s cubic-bezier(0,0,.35,1);
-}
-.transition_x_enterFrom {
-	opacity: 0;
-	transform: translateX(50px);
-}
-.transition_x_leaveTo {
-	opacity: 0;
-	transform: translateX(-50px);
-}
-
-.progressBar {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 10;
-	width: 100%;
-	height: 4px;
-}
-
-.progressBarValue {
-	height: 100%;
-	background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
-	transition: all 0.5s cubic-bezier(0,.5,.5,1);
-}
-
-.centerPage {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	height: 100cqh;
-	padding-bottom: 30px;
-	box-sizing: border-box;
-}
-
-.pageRoot {
-	display: flex;
-	flex-direction: column;
-	min-height: 100%;
-}
-
-.pageMain {
-	flex-grow: 1;
-}
-
-.pageFooter {
-	position: sticky;
-	bottom: 0;
-	left: 0;
-	flex-shrink: 0;
-	padding: 12px;
-	border-top: solid 0.5px var(--MI_THEME-divider);
-	-webkit-backdrop-filter: blur(15px);
-	backdrop-filter: blur(15px);
-}
-</style>

packages/frontend/src/components/form/link.vue

@@ -5,17 +5,31 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="[$style.root, { [$style.inline]: inline }]">
-	<a v-if="external" :class="$style.main" class="_button" :href="to" target="_blank">
+	<a v-if="external" :class="[$style.main, { [$style.large]: large }]" class="_button" :href="to" target="_blank">
 		<span :class="$style.icon"><slot name="icon"></slot></span>
-		<span :class="$style.text"><slot></slot></span>
+		<div :class="$style.headerText">
+			<div>
+				<MkCondensedLine :minScale="2 / 3"><slot></slot></MkCondensedLine>
+			</div>
+			<div v-if="$slots.caption" :class="$style.headerTextSub">
+				<MkCondensedLine :minScale="2 / 3"><slot name="caption"></slot></MkCondensedLine>
+			</div>
+		</div>
 		<span :class="$style.suffix">
 			<span :class="$style.suffixText"><slot name="suffix"></slot></span>
 			<i class="ti ti-external-link"></i>
 		</span>
 	</a>
-	<MkA v-else :class="[$style.main, { [$style.active]: active }]" class="_button" :to="to" :behavior="behavior">
+	<MkA v-else :class="[$style.main, { [$style.large]: large, [$style.active]: active }]" class="_button" :to="to" :behavior="behavior">
 		<span :class="$style.icon"><slot name="icon"></slot></span>
-		<span :class="$style.text"><slot></slot></span>
+		<div :class="$style.headerText">
+			<div>
+				<MkCondensedLine :minScale="2 / 3"><slot></slot></MkCondensedLine>
+			</div>
+			<div v-if="$slots.caption" :class="$style.headerTextSub">
+				<MkCondensedLine :minScale="2 / 3"><slot name="caption"></slot></MkCondensedLine>
+			</div>
+		</div>
 		<span :class="$style.suffix">
 			<span :class="$style.suffixText"><slot name="suffix"></slot></span>
 			<i class="ti ti-chevron-right"></i>
@@ -33,6 +47,7 @@ const props = defineProps<{
 	external?: boolean;
 	behavior?: null | 'window' | 'browser';
 	inline?: boolean;
+	large?: boolean;
 }>();
 </script>
 
@@ -55,6 +70,10 @@ const props = defineProps<{
 	border-radius: 6px;
 	font-size: 0.9em;
 
+	&.large {
+		font-size: 1em;
+	}
+
 	&:hover {
 		text-decoration: none;
 		background: var(--MI_THEME-folderHeaderHoverBg);
@@ -81,11 +100,17 @@ const props = defineProps<{
 	}
 }
 
-.text {
-	flex-shrink: 1;
-	white-space: normal;
+.headerText {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	text-align: start;
+	overflow: hidden;
 	padding-right: 12px;
-	text-align: center;
+}
+
+.headerTextSub {
+	color: var(--MI_THEME-fgTransparentWeak);
+	font-size: .85em;
 }
 
 .suffix {

packages/frontend/src/pages/admin/moderation.vue

@@ -19,6 +19,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #label>{{ i18n.ts.emailRequiredForSignup }}</template>
 					</MkSwitch>
 
+					<MkSwitch v-model="prohibitSkippingInitialTutorial" @change="onChange_prohibitSkippingInitialTutorial">
+						<template #label>{{ i18n.ts.prohibitSkippingInitialTutorial }}</template>
+						<template #caption>{{ i18n.ts.prohibitSkippingInitialTutorialDescription }}</template>
+					</MkSwitch>
+
 					<FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink>
 
 					<MkFolder>
@@ -141,6 +146,7 @@ import MkFolder from '@/components/MkFolder.vue';
 
 const enableRegistration = ref<boolean>(false);
 const emailRequiredForSignup = ref<boolean>(false);
+const prohibitSkippingInitialTutorial = ref<boolean>(false);
 const sensitiveWords = ref<string>('');
 const prohibitedWords = ref<string>('');
 const prohibitedWordsForNameOfUser = ref<string>('');
@@ -154,6 +160,7 @@ async function init() {
 	const meta = await misskeyApi('admin/meta');
 	enableRegistration.value = !meta.disableRegistration;
 	emailRequiredForSignup.value = meta.emailRequiredForSignup;
+	prohibitSkippingInitialTutorial.value = !meta.canSkipInitialTutorial;
 	sensitiveWords.value = meta.sensitiveWords.join('\n');
 	prohibitedWords.value = meta.prohibitedWords.join('\n');
 	prohibitedWordsForNameOfUser.value = meta.prohibitedWordsForNameOfUser.join('\n');
@@ -180,6 +187,14 @@ function onChange_emailRequiredForSignup(value: boolean) {
 	});
 }
 
+function onChange_prohibitSkippingInitialTutorial(value: boolean) {
+	os.apiWithDialog('admin/update-meta', {
+		canSkipInitialTutorial: !value,
+	}).then(() => {
+		fetchInstance(true);
+	});
+}
+
 function save_preservedUsernames() {
 	os.apiWithDialog('admin/update-meta', {
 		preservedUsernames: preservedUsernames.value.split('\n'),

packages/frontend/src/pages/onboarding.vue

@@ -0,0 +1,383 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="[$style.onboardingRoot, { [$style.ready]: animationPhase >= 1 }]">
+	<MkAnimBg :class="$style.onboardingBg"/>
+	<div :class="[$style.onboardingContainer]">
+		<div :class="[$style.tutorialTitle, { [$style.showing]: ((tutorialEl?.page ?? 0) !== 0) }]">
+			<div :class="$style.text">
+				<span v-if="tutorialEl?.currentPageDef">
+					<i v-if="tutorialEl.currentPageDef.icon" :class="tutorialEl.currentPageDef.icon"></i> {{ tutorialEl.currentPageDef.title }}
+				</span>
+				<span v-else>{{ i18n.ts._initialTutorial.title }}</span>
+			</div>
+			<div v-if="instance.canSkipInitialTutorial" :class="$style.closeButton">
+				<button class="_button" data-cy-user-setup-close @click="cancel"><i class="ti ti-x"></i></button>
+			</div>
+		</div>
+		<MkTutorial
+			ref="tutorialEl"
+			:class="$style.tutorialRoot"
+			:showProgressbar="true"
+			:skippable="false"
+			:withSetup="true"
+		>
+			<template #welcome="{ next }">
+				<div ref="welcomePageRootEl" :class="$style.welcomePageRoot">
+					<canvas ref="confettiEl" :class="$style.welcomePageConfetti"></canvas>
+					<div
+						:class="[
+							$style.centerPage,
+							$style.welcomePageMain,
+							{
+								[$style.appear]: animationPhase >= 3,
+								[$style.done]: animationPhase === 4,
+							}
+						]"
+					>
+						<MkSpacer :marginMin="20" :marginMax="28">
+							<div class="_gaps" style="word-break: auto-phrase; text-align: center;">
+								<img ref="instanceIconEl" :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
+								<div>
+									<div style="font-size: 135%;">{{ i18n.ts._initialTutorial._onboardingLanding.accountCreated }}</div>
+									<div>{{ i18n.tsx._initialTutorial._onboardingLanding.welcomeToX({ name: instance.name ?? host }) }}</div>
+								</div>
+								<div>{{ i18n.tsx._initialTutorial._onboardingLanding.description({ name: instance.name ?? host }) }}</div>
+								<MkButton large primary rounded gradate style="margin: 16px auto 0;" data-cy-user-setup-start @click="next">{{ i18n.ts.start }} <i class="ti ti-arrow-right"></i></MkButton>
+								<MkButton v-if="instance.canSkipInitialTutorial" transparent rounded style="margin: 0 auto;" data-cy-user-setup-close @click="cancel">{{ i18n.ts.later }}</MkButton>
+								<MkInfo v-else warn style="width: fit-content; margin: 0 auto; text-align: start; white-space: pre-wrap;">{{ i18n.ts._initialTutorial._onboardingLanding.adminForcesToTakeTutorial }}</MkInfo>
+								<MkInfo style="width: fit-content; margin: 0 auto; text-align: start; white-space: pre-wrap;">{{ i18n.tsx._initialTutorial._onboardingLanding.takesAbout({ min: 3 }) }}</MkInfo>
+							</div>
+						</MkSpacer>
+					</div>
+					<div
+						:class="[
+							$style.welcomePageAnimRoot,
+							{
+								[$style.appear]: animationPhase === 2,
+								[$style.move]: animationPhase === 3,
+							},
+						]"
+					>
+						<img :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
+					</div>
+				</div>
+			</template>
+			<template #finish="{ prev }">
+				<div :class="$style.centerPage">
+					<MkSpacer :marginMin="20" :marginMax="28">
+						<div class="_gaps">
+							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
+							<div style="text-align: center; font-size: 120%;">{{ i18n.ts._initialTutorial._done.title }}</div>
+							<div style="text-align: center;">{{ i18n.tsx._initialTutorial._onboardingDone.description({ name: instance.name ?? host }) }}</div>
+							<div>
+								<FormLink v-if="originalPath && originalPath !== '/'" :to="originalPath" large :behavior="'browser'">
+									<template #icon><i class="ti ti-directions"></i></template>
+									{{ i18n.ts._initialTutorial._onboardingDone.backToOriginalPath }}
+									<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.backToOriginalPathDescription }}</template>
+								</FormLink>
+								<hr v-if="originalPath && originalPath !== '/'">
+								<div class="_gaps_s">
+									<FormLink to="/settings/profile" large :behavior="'browser'">
+										<template #icon><i class="ti ti-user"></i></template>
+										{{ i18n.ts._initialTutorial._onboardingDone.profile }}
+										<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.profileDescription }}</template>
+									</FormLink>
+									<FormLink to="/explore" large :behavior="'browser'">
+										<template #icon><i class="ti ti-hash"></i></template>
+										{{ i18n.ts.explore }}
+										<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.exploreDescription }}</template>
+									</FormLink>
+									<FormLink to="/" large :behavior="'browser'" data-cy-user-setup-complete>
+										<template #icon><i class="ti ti-home"></i></template>
+										{{ i18n.ts._initialTutorial._onboardingDone.goToTimeline }}
+										<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.goToTimelineDescription }}</template>
+									</FormLink>
+								</div>
+							</div>
+							<MkInfo style="border-radius: 6px;">{{ i18n.ts._initialTutorial._done.youCanReferTutorialBy }}</MkInfo>
+							<div style="text-align: center;">{{ i18n.tsx._initialTutorial._done.haveFun({ name: instance.name ?? host }) }}</div>
+						</div>
+					</MkSpacer>
+				</div>
+			</template>
+		</MkTutorial>
+	</div>
+</div>
+</template>
+
+<script setup lang="ts">
+import { ref, shallowRef, computed, onMounted } from 'vue';
+import { create as createConfetti } from 'canvas-confetti';
+
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { reactionPicker } from '@/scripts/reaction-picker.js';
+import { i18n } from '@/i18n.js';
+import { instance } from '@/instance.js';
+import { host } from '@@/js/config.js';
+import { confirm as osConfirm } from '@/os.js';
+
+import MkAnimBg from '@/components/MkAnimBg.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import MkTutorial from '@/components/MkTutorial.vue';
+
+import FormLink from '@/components/form/link.vue';
+
+const tutorialEl = shallowRef<InstanceType<typeof MkTutorial> | null>(null);
+
+// See: @/_boot_/common.ts L123 for details
+const query = new URLSearchParams(location.search);
+const originalPath = query.get('redirected_from');
+
+async function cancel() {
+	const confirm = await osConfirm({
+		type: 'question',
+		title: i18n.ts._initialTutorial.skipAreYouSure,
+		text: i18n.ts._initialTutorial._done.youCanReferTutorialBy,
+		okText: i18n.ts.yes,
+		cancelText: i18n.ts.no,
+	});
+
+	if (confirm.canceled) return;
+
+	location.href = '/';
+}
+
+// #region デフォルトオープニング画面のアニメーション
+const confettiEl = shallowRef<HTMLCanvasElement | null>(null);
+const welcomePageRootEl = shallowRef<HTMLDivElement | null>(null);
+const instanceIconEl = shallowRef<HTMLImageElement | null>(null);
+const instanceIconY = ref(0);
+// 30pxは文字が上がってくる距離、40pxは上部ヘッダの高さ
+const instanceIconYPx = computed(() => `${instanceIconY.value - 30 + 40}px`);
+
+/**
+ * 0 … なにもしない
+ * 1 … 背景表示（mounted）
+ * 2 … サーバーロゴ出現
+ * 3 … サーバーロゴ移動・文字表示
+ * 4 … 完了（オープニング用ロゴ消滅）
+ */
+const animationPhase = ref(0);
+
+// 画面上部に表示されるアイコンの中心Y座標を取得
+function getIconY(instanceIconEl: HTMLImageElement, welcomePageRootEl: HTMLDivElement) {
+	const instanceIconElRect = instanceIconEl.getBoundingClientRect();
+	return instanceIconElRect.top - welcomePageRootEl.getBoundingClientRect().top;
+}
+
+function instanceIconElImageLoaded() {
+	return new Promise<void>((resolve) => {
+		if (instanceIconEl.value!.complete) {
+			resolve();
+		} else {
+			instanceIconEl.value!.addEventListener('load', () => resolve(), { once: true });
+		}
+	});
+}
+
+onMounted(() => {
+	const confetti = createConfetti(confettiEl.value!, {
+		resize: true,
+	});
+
+	instanceIconY.value = getIconY(instanceIconEl.value!, welcomePageRootEl.value!);
+	window.addEventListener('resize', () => {
+		instanceIconY.value = getIconY(instanceIconEl.value!, welcomePageRootEl.value!);
+	}, { passive: true });
+
+	// チュートリアル内で必須（subBootでは初期化されないので）
+	Promise.all([
+		reactionPicker.init(),
+		instanceIconElImageLoaded(),
+	]).then(() => {
+		setTimeout(() => {
+			// 待たないとアニメーションが正しく動かない場合がある
+			animationPhase.value = 1;
+
+			setTimeout(() => {
+				animationPhase.value = 2;
+
+				setTimeout(() => {
+					animationPhase.value = 3;
+
+					setTimeout(() => {
+						animationPhase.value = 4;
+						confetti({
+							spread: 75,
+							particleCount: 100,
+							origin: { y: 0.5 },
+						});
+					}, 1000);
+				}, 1250);
+			}, 500);
+		}, 100);
+	});
+});
+
+// #endregion
+
+definePageMetadata(() => ({
+	title: i18n.tsx._initialTutorial._onboardingLanding.welcomeToX({ name: instance.name ?? host }),
+}));
+</script>
+
+<style lang="scss" module>
+.onboardingRoot {
+	box-sizing: border-box;
+	display: grid;
+	place-content: center;
+	min-height: 100svh;
+	padding: 32px 32px 64px 32px;
+}
+
+.onboardingBg {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+	transition: opacity 2s ease;
+}
+
+.onboardingContainer {
+	position: relative;
+	border-radius: var(--MI-radius);
+	background-color: var(--MI_THEME-acrylicPanel);
+	overflow: clip;
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+	max-width: 650px;
+	max-height: 700px;
+	width: 100vw;
+	height: 100svh;
+
+	container-type: inline-size;
+}
+
+.tutorialTitle {
+	position: absolute;
+	box-sizing: border-box;
+	top: 0;
+	left: 0;
+	width: 100%;
+	font-size: 14px;
+	line-height: 40px;
+	height: 40px;
+	padding: 0 var(--MI-margin);
+	background: var(--MI_THEME-panelHighlight);
+	display: flex;
+	transition: transform 0.5s ease;
+	transform: translateY(-100%);
+
+	&.showing {
+		transform: translateY(0);
+	}
+
+	.text {
+		font-weight: 700;
+	}
+
+	.closeButton {
+		margin-left: auto;
+
+		>._button {
+			padding: 8px;
+		}
+	}
+}
+
+.tutorialRoot {
+	margin-top: 40px;
+	height: calc(100% - 40px);
+}
+
+.ready {
+	& .onboardingBg {
+		opacity: 1;
+	}
+}
+
+.centerPage {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	min-height: 100%;
+	box-sizing: border-box;
+	overflow-y: auto;
+}
+
+.welcomePageRoot {
+	position: relative;
+	height: 100%;
+}
+
+.welcomePageMain {
+	opacity: 0;
+	transform: translateY(30px);
+	visibility: hidden;
+
+	.instanceIcon {
+		opacity: 0;
+	}
+
+	&.appear {
+		transition: opacity 0.75s 0.25s ease, transform 0.75s 0.25s ease;
+		opacity: 1;
+		transform: translateY(0);
+		visibility: visible;
+	}
+
+	&.done .instanceIcon {
+		opacity: 1;
+	}
+}
+
+.instanceIcon {
+	height: 5em;
+	width: 5em;
+	margin: 0 auto;
+	object-fit: contain;
+	border-radius: calc(var(--MI-radius) / 2);
+}
+
+.welcomePageConfetti,
+.welcomePageAnimRoot {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	overflow: clip;
+	pointer-events: none;
+
+	.instanceIcon {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		opacity: 0;
+	}
+
+	&.appear {
+		.instanceIcon {
+			opacity: 1;
+			transform: translate(-50%, -50%) scale(1.5);
+			transition: opacity 1s cubic-bezier(0.22, 0.61, 0.36, 1), transform 1s cubic-bezier(0.22, 0.61, 0.36, 1);
+		}
+	}
+
+	&.move {
+		.instanceIcon {
+			opacity: 1;
+			transform: translate(-50%, 0) scale(1);
+			top: v-bind(instanceIconYPx);
+			transition: transform 1s ease, top 1s ease;
+		}
+	}
+}
+</style>

packages/frontend/src/pages/signup-complete.vue

@@ -46,7 +46,7 @@ function submit() {
 	misskeyApi('signup-pending', {
 		code: props.code,
 	}).then(res => {
-		return login(res.i, '/');
+		return login(res.i, '/onboarding');
 	}).catch(() => {
 		submitting.value = false;
 

packages/frontend/src/router/definition.ts

@@ -189,6 +189,10 @@ const routes: RouteDef[] = [{
 }, {
 	path: '/signup-complete/:code',
 	component: page(() => import('@/pages/signup-complete.vue')),
+}, {
+	path: '/onboarding',
+	component: page(() => import('@/pages/onboarding.vue')),
+	loginRequired: true,
 }, {
 	path: '/announcements',
 	component: page(() => import('@/pages/announcements.vue')),

packages/frontend/src/scripts/achievements.ts

@@ -4,7 +4,7 @@
  */
 
 import { misskeyApi } from '@/scripts/misskey-api.js';
-import { $i } from '@/account.js';
+import { $i, refreshAccount } from '@/account.js';
 
 export const ACHIEVEMENT_TYPES = [
 	'notes1',
@@ -500,6 +500,10 @@ export async function claimAchievement(type: typeof ACHIEVEMENT_TYPES[number]) {
 	await new Promise(resolve => setTimeout(resolve, (claimingQueue.size - 1) * 500));
 	window.setTimeout(() => {
 		claimingQueue.delete(type);
+
+		if (claimingQueue.size === 0) {
+			refreshAccount();
+		}
 	}, 500);
 	misskeyApi('i/claim-achievement', { name: type });
 }

packages/frontend/src/scripts/reaction-picker.ts

@@ -14,12 +14,15 @@ class ReactionPicker {
 	private targetNote: Ref<Misskey.entities.Note | null> = ref(null);
 	private onChosen?: (reaction: string) => void;
 	private onClosed?: () => void;
+	public isInitialized = false;
 
 	constructor() {
 		// nop
 	}
 
 	public async init() {
+		if (this.isInitialized) return;
+
 		const reactionsRef = defaultStore.reactiveState.reactions;
 		await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
 			src: this.src,
@@ -39,6 +42,7 @@ class ReactionPicker {
 				if (this.onClosed) this.onClosed();
 			},
 		});
+		this.isInitialized = true;
 	}
 
 	public show(src: HTMLElement | null, targetNote: Misskey.entities.Note | null, onChosen?: ReactionPicker['onChosen'], onClosed?: ReactionPicker['onClosed']) {

packages/frontend/src/type.ts

@@ -6,3 +6,6 @@
 export type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
 
 export type WithNonNullable<T, K extends keyof T> = T & { [P in K]-?: NonNullable<T[P]> };
+
+type TupleOf<T, N extends number, R extends unknown[]> = R['length'] extends N ? R : TupleOf<T, N, [T, ...R]>;
+export type Tuple<T, N extends number> = N extends N ? number extends N ? T[] : TupleOf<T, N, []> : never;