merge: upstream changes

packages/frontend/package.json

@@ -78,24 +78,24 @@
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
-		"@storybook/addon-actions": "7.4.6",
-		"@storybook/addon-essentials": "7.4.6",
-		"@storybook/addon-interactions": "7.4.6",
-		"@storybook/addon-links": "7.4.6",
-		"@storybook/addon-storysource": "7.4.6",
-		"@storybook/addons": "7.4.6",
-		"@storybook/blocks": "7.4.6",
-		"@storybook/core-events": "7.4.6",
+		"@storybook/addon-actions": "7.5.0",
+		"@storybook/addon-essentials": "7.5.0",
+		"@storybook/addon-interactions": "7.5.0",
+		"@storybook/addon-links": "7.5.0",
+		"@storybook/addon-storysource": "7.5.0",
+		"@storybook/addons": "7.5.0",
+		"@storybook/blocks": "7.5.0",
+		"@storybook/core-events": "7.5.0",
 		"@storybook/jest": "0.2.3",
-		"@storybook/manager-api": "7.4.6",
-		"@storybook/preview-api": "7.4.6",
-		"@storybook/react": "7.4.6",
-		"@storybook/react-vite": "7.4.6",
+		"@storybook/manager-api": "7.5.0",
+		"@storybook/preview-api": "7.5.0",
+		"@storybook/react": "7.5.0",
+		"@storybook/react-vite": "7.5.0",
 		"@storybook/testing-library": "0.2.2",
-		"@storybook/theming": "7.4.6",
-		"@storybook/types": "7.4.6",
-		"@storybook/vue3": "7.4.6",
-		"@storybook/vue3-vite": "7.4.6",
+		"@storybook/theming": "7.5.0",
+		"@storybook/types": "7.5.0",
+		"@storybook/vue3": "7.5.0",
+		"@storybook/vue3-vite": "7.5.0",
 		"@testing-library/vue": "7.0.0",
 		"@types/escape-regexp": "0.0.1",
 		"@types/estree": "1.0.2",
@@ -109,8 +109,8 @@
 		"@types/uuid": "9.0.5",
 		"@types/websocket": "1.0.7",
 		"@types/ws": "8.5.7",
-		"@typescript-eslint/eslint-plugin": "6.7.5",
-		"@typescript-eslint/parser": "6.7.5",
+		"@typescript-eslint/eslint-plugin": "6.8.0",
+		"@typescript-eslint/parser": "6.8.0",
 		"@vitest/coverage-v8": "0.34.6",
 		"@vue/runtime-core": "3.3.4",
 		"acorn": "8.10.0",
@@ -129,7 +129,7 @@
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
 		"start-server-and-test": "2.0.1",
-		"storybook": "7.4.6",
+		"storybook": "7.5.0",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"summaly": "github:misskey-dev/summaly",
 		"vite-plugin-turbosnap": "1.0.3",

packages/frontend/src/components/MkFollowButton.vue

@@ -42,6 +42,7 @@ import { useStream } from '@/stream.js';
 import { i18n } from '@/i18n.js';
 import { claimAchievement } from '@/scripts/achievements.js';
 import { $i } from '@/account.js';
+import { defaultStore } from "@/store.js";
 
 const props = withDefaults(defineProps<{
 	user: Misskey.entities.UserDetailed,
@@ -52,6 +53,10 @@ const props = withDefaults(defineProps<{
 	large: false,
 });
 
+const emit = defineEmits<{
+	(_: 'update:user', value: Misskey.entities.UserDetailed): void
+}>();
+
 let isFollowing = $ref(props.user.isFollowing);
 let hasPendingFollowRequestFromYou = $ref(props.user.hasPendingFollowRequestFromYou);
 let wait = $ref(false);
@@ -95,6 +100,11 @@ async function onClick() {
 			} else {
 				await os.api('following/create', {
 					userId: props.user.id,
+					withReplies: defaultStore.state.defaultWithReplies,
+				});
+				emit('update:user', {
+					...props.user,
+					withReplies: defaultStore.state.defaultWithReplies
 				});
 				hasPendingFollowRequestFromYou = true;
 

packages/frontend/src/components/MkUserPopup.vue

@@ -46,7 +46,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</div>
 			<button class="_button" :class="$style.menu" @click="showMenu"><i class="ph-dots-three ph-bold ph-lg"></i></button>
-			<MkFollowButton v-if="$i && user.id != $i.id" :class="$style.follow" :user="user" mini/>
+			<MkFollowButton v-if="$i && user.id != $i.id" v-model:user="user" :class="$style.follow" mini/>
 		</div>
 		<div v-else>
 			<MkLoading/>

packages/frontend/src/pages/follow.vue

@@ -14,6 +14,7 @@ import * as Misskey from 'misskey-js';
 import * as os from '@/os.js';
 import { mainRouter } from '@/router.js';
 import { i18n } from '@/i18n.js';
+import { defaultStore } from "@/store.js";
 
 async function follow(user): Promise<void> {
 	const { canceled } = await os.confirm({
@@ -28,7 +29,9 @@ async function follow(user): Promise<void> {
 
 	os.apiWithDialog('following/create', {
 		userId: user.id,
+		withReplies: defaultStore.state.defaultWithReplies,
 	});
+	user.withReplies = defaultStore.state.defaultWithReplies;
 }
 
 const acct = new URL(location.href).searchParams.get('acct');

packages/frontend/src/pages/gallery/post.vue

@@ -38,7 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkUserName :user="post.user" style="display: block;"/>
 								<MkAcct :user="post.user"/>
 							</div>
-							<MkFollowButton v-if="!$i || $i.id != post.user.id" :user="post.user" :inline="true" :transparent="false" :full="true" large class="koudoku"/>
+							<MkFollowButton v-if="!$i || $i.id != post.user.id" v-model:user="post.user" :inline="true" :transparent="false" :full="true" large class="koudoku"/>
 						</div>
 					</div>
 					<MkAd :prefer="['horizontal', 'horizontal-big']"/>

packages/frontend/src/pages/settings/general.vue

@@ -29,6 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div class="_gaps_s">
 			<MkSwitch v-model="showFixedPostForm">{{ i18n.ts.showFixedPostForm }}</MkSwitch>
 			<MkSwitch v-model="showFixedPostFormInChannel">{{ i18n.ts.showFixedPostFormInChannel }}</MkSwitch>
+			<MkSwitch v-model="defaultWithReplies">{{ i18n.ts.withRepliesByDefaultForNewlyFollowed }}</MkSwitch>
 			<MkFolder>
 				<template #label>{{ i18n.ts.pinnedList }}</template>
 				<!-- 複数ピン止め管理できるようにしたいけどめんどいので一旦ひとつのみ -->
@@ -257,6 +258,7 @@ const mediaListWithOneImageAppearance = computed(defaultStore.makeGetterSetter('
 const notificationPosition = computed(defaultStore.makeGetterSetter('notificationPosition'));
 const notificationStackAxis = computed(defaultStore.makeGetterSetter('notificationStackAxis'));
 const keepScreenOn = computed(defaultStore.makeGetterSetter('keepScreenOn'));
+const defaultWithReplies = computed(defaultStore.makeGetterSetter('defaultWithReplies'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);

packages/frontend/src/pages/settings/import-export.vue

@@ -40,6 +40,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkFolder v-if="$i && !$i.movedTo">
 				<template #label>{{ i18n.ts.import }}</template>
 				<template #icon><i class="ph-upload ph-bold ph-lg"></i></template>
+				<MkSwitch v-model="withReplies">
+					{{ i18n.ts._exportOrImport.withReplies }}
+				</MkSwitch>
 				<MkButton primary :class="$style.button" inline @click="importFollowing($event)"><i class="ph-upload ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
 			</MkFolder>
 		</div>
@@ -118,9 +121,11 @@ import { selectFile } from '@/scripts/select-file.js';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { $i } from '@/account.js';
+import { defaultStore } from "@/store.js";
 
 const excludeMutingUsers = ref(false);
 const excludeInactiveUsers = ref(false);
+const withReplies = ref(defaultStore.state.defaultWithReplies);
 
 const onExportSuccess = () => {
 	os.alert({
@@ -177,7 +182,10 @@ const exportAntennas = () => {
 
 const importFollowing = async (ev) => {
 	const file = await selectFile(ev.currentTarget ?? ev.target);
-	os.api('i/import-following', { fileId: file.id }).then(onImportSuccess).catch(onError);
+	os.api('i/import-following', {
+		fileId: file.id,
+		withReplies: withReplies.value,
+	}).then(onImportSuccess).catch(onError);
 };
 
 const importUserLists = async (ev) => {

packages/frontend/src/pages/user/home.vue

@@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
 						<div v-if="$i" class="actions">
 							<button class="menu _button" @click="menu"><i class="ph-dots-three ph-bold ph-lg"></i></button>
-							<MkFollowButton v-if="$i.id != user.id" :user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
+							<MkFollowButton v-if="$i.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
 						</div>
 					</div>
 					<MkAvatar class="avatar" :user="user" indicator/>
@@ -212,6 +212,7 @@ const props = withDefaults(defineProps<{
 
 const router = useRouter();
 
+let user = $ref(props.user);
 let parallaxAnimationId = $ref<null | number>(null);
 let narrow = $ref<null | boolean>(null);
 let rootEl = $ref<null | HTMLElement>(null);
@@ -284,7 +285,7 @@ const age = $computed(() => {
 });
 
 function menu(ev) {
-	const { menu, cleanup } = getUserMenu(props.user, router);
+	const { menu, cleanup } = getUserMenu(user, router);
 	os.popupMenu(menu, ev.currentTarget ?? ev.target).finally(cleanup);
 }
 

packages/frontend/src/store.ts

@@ -377,6 +377,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: true,
 	},
+	defaultWithReplies: {
+		where: 'account',
+		default: false,
+	},
 }));
 
 // TODO: 他のタブと永続化されたstateを同期