Feat: HTLとSTLをローカルのみに絞り込む機能

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -47,7 +47,7 @@ export const meta = {
 		bothWithRepliesAndWithFiles: {
 			message: 'Specifying both withReplies and withFiles is not supported',
 			code: 'BOTH_WITH_REPLIES_AND_WITH_FILES',
-			id: 'dfaa3eb7-8002-4cb7-bcc4-1095df46656f'
+			id: 'dfaa3eb7-8002-4cb7-bcc4-1095df46656f',
 		},
 	},
 } as const;
@@ -67,6 +67,7 @@ export const paramDef = {
 		withFiles: { type: 'boolean', default: false },
 		withRenotes: { type: 'boolean', default: true },
 		withReplies: { type: 'boolean', default: false },
+		onlyLocal: { type: 'boolean', default: false },
 	},
 	required: [],
 } as const;
@@ -113,6 +114,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					includeLocalRenotes: ps.includeLocalRenotes,
 					withFiles: ps.withFiles,
 					withReplies: ps.withReplies,
+					onlyLocal: ps.onlyLocal,
 				}, me);
 
 				process.nextTick(() => {
@@ -152,6 +154,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				useDbFallback: serverSettings.enableFanoutTimelineDbFallback,
 				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
+				noteFilter: (note) => {
+					if (ps.onlyLocal && note.user && note.user.host !== null ) {
+						return false;
+					}
+					return true;
+				},
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
 					untilId,
 					sinceId,
@@ -161,6 +169,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					includeLocalRenotes: ps.includeLocalRenotes,
 					withFiles: ps.withFiles,
 					withReplies: ps.withReplies,
+					onlyLocal: ps.onlyLocal,
 				}, me),
 			});
 
@@ -181,6 +190,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		includeLocalRenotes: boolean,
 		withFiles: boolean,
 		withReplies: boolean,
+		onlyLocal: boolean,
 	}, me: MiLocalUser) {
 		const followees = await this.userFollowingService.getFollowees(me.id);
 		const followingChannels = await this.channelFollowingsRepository.find({
@@ -267,6 +277,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		if (ps.withFiles) {
 			query.andWhere('note.fileIds != \'{}\'');
 		}
+
+		if (ps.onlyLocal) {
+			query.andWhere('note.userHost IS NULL');
+		}
 		//#endregion
 
 		return await query.limit(ps.limit).getMany();

packages/backend/src/server/api/endpoints/notes/timeline.ts

@@ -49,6 +49,7 @@ export const paramDef = {
 		includeLocalRenotes: { type: 'boolean', default: true },
 		withFiles: { type: 'boolean', default: false },
 		withRenotes: { type: 'boolean', default: true },
+		onlyLocal: { type: 'boolean', default: false },
 	},
 	required: [],
 } as const;
@@ -87,6 +88,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					includeLocalRenotes: ps.includeLocalRenotes,
 					withFiles: ps.withFiles,
 					withRenotes: ps.withRenotes,
+					onlyLocal: ps.onlyLocal,
 				}, me);
 
 				process.nextTick(() => {
@@ -117,6 +119,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 						if (!Object.hasOwn(followings, note.reply.userId)) return false;
 					}
 
+					if (ps.onlyLocal && note.user && note.user.host !== null ) {
+						return false;
+					}
+
 					return true;
 				},
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
@@ -128,6 +134,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					includeLocalRenotes: ps.includeLocalRenotes,
 					withFiles: ps.withFiles,
 					withRenotes: ps.withRenotes,
+					onlyLocal: ps.onlyLocal,
 				}, me),
 			});
 
@@ -139,7 +146,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		});
 	}
 
-	private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; withRenotes: boolean; }, me: MiLocalUser) {
+	private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; withRenotes: boolean; onlyLocal: boolean; }, me: MiLocalUser) {
 		const followees = await this.userFollowingService.getFollowees(me.id);
 		const followingChannels = await this.channelFollowingsRepository.find({
 			where: {
@@ -241,6 +248,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		if (ps.withRenotes === false) {
 			query.andWhere('note.renoteId IS NULL');
 		}
+
+		if (ps.onlyLocal) {
+			query.andWhere('note.userHost IS NULL');
+		}
 		//#endregion
 
 		return await query.limit(ps.limit).getMany();

packages/frontend/src/components/MkTimeline.vue

@@ -38,10 +38,12 @@ const props = withDefaults(defineProps<{
 	withRenotes?: boolean;
 	withReplies?: boolean;
 	onlyFiles?: boolean;
+	onlyLocal?: boolean;
 }>(), {
 	withRenotes: true,
 	withReplies: false,
 	onlyFiles: false,
+	onlyLocal: false,
 });
 
 const emit = defineEmits<{
@@ -61,6 +63,7 @@ type TimelineQueryType = {
   listId?: string,
   channelId?: string,
   roleId?: string
+	onlyLocal?: boolean,
 }
 
 const prComponent = shallowRef<InstanceType<typeof MkPullToRefresh>>();
@@ -71,6 +74,8 @@ let tlNotesCount = 0;
 function prepend(note) {
 	if (tlComponent.value == null) return;
 
+	if (props.onlyLocal === true && note.user.host !== null) return;
+
 	tlNotesCount++;
 
 	if (instance.notesPerOneAd > 0 && tlNotesCount % instance.notesPerOneAd === 0) {
@@ -172,6 +177,7 @@ function updatePaginationQuery() {
 		query = {
 			withRenotes: props.withRenotes,
 			withFiles: props.onlyFiles ? true : undefined,
+			onlyLocal: props.onlyLocal ? true : undefined,
 		};
 	} else if (props.src === 'local') {
 		endpoint = 'notes/local-timeline';
@@ -186,6 +192,7 @@ function updatePaginationQuery() {
 			withRenotes: props.withRenotes,
 			withReplies: props.withReplies,
 			withFiles: props.onlyFiles ? true : undefined,
+			onlyLocal: props.onlyLocal ? true : undefined,
 		};
 	} else if (props.src === 'global') {
 		endpoint = 'notes/global-timeline';
@@ -245,7 +252,7 @@ function refreshEndpointAndChannel() {
 
 // デッキのリストカラムでwithRenotesを変更した場合に自動的に更新されるようにさせる
 // IDが切り替わったら切り替え先のTLを表示させたい
-watch(() => [props.list, props.antenna, props.channel, props.role, props.withRenotes], refreshEndpointAndChannel);
+watch(() => [props.list, props.antenna, props.channel, props.role, props.withRenotes, props.onlyLocal], refreshEndpointAndChannel);
 
 // 初回表示用
 refreshEndpointAndChannel();

packages/frontend/src/pages/timeline.vue

@@ -23,6 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						:withRenotes="withRenotes"
 						:withReplies="withReplies"
 						:onlyFiles="onlyFiles"
+						:onlyLocal="onlyLocal"
 						:sound="true"
 						@queue="queueUpdated"
 					/>
@@ -116,6 +117,11 @@ const withSensitive = computed<boolean>({
 	set: (x) => saveTlFilter('withSensitive', x),
 });
 
+const onlyLocal = computed<boolean>({
+	get: () => defaultStore.reactiveState.tl.value.filter.onlyLocal,
+	set: (x) => saveTlFilter('onlyLocal', x),
+});
+
 watch(src, () => {
 	queue.value = 0;
 });
@@ -264,7 +270,11 @@ const headerActions = computed(() => {
 					text: i18n.ts.fileAttachedOnly,
 					ref: onlyFiles,
 					disabled: src.value === 'local' || src.value === 'social' ? withReplies : false,
-				}], ev.currentTarget ?? ev.target);
+				}, src.value === 'home' || src.value === 'social' ? {
+					type: 'switch',
+					text: i18n.ts.localOnly,
+					ref: onlyLocal,
+				} : undefined,], ev.currentTarget ?? ev.target);
 			},
 		},
 	];

packages/frontend/src/store.ts

@@ -191,6 +191,7 @@ export const defaultStore = markRaw(new Storage('base', {
 				withRenotes: true,
 				withSensitive: true,
 				onlyFiles: false,
+				onlyLocal: false,
 			},
 		},
 	},
@@ -431,10 +432,10 @@ export const defaultStore = markRaw(new Storage('base', {
 			sfxVolume: 1,
 		},
 	},
-  hemisphere: {
+	hemisphere: {
 		where: 'device',
 		default: hemisphere as 'N' | 'S',
-  },
+	},
 	enableHorizontalSwipe: {
 		where: 'device',
 		default: false,

packages/frontend/src/ui/deck/deck-store.ts

@@ -33,6 +33,7 @@ export type Column = {
 	withRenotes?: boolean;
 	withReplies?: boolean;
 	onlyFiles?: boolean;
+	onlyLocal?: boolean;
 };
 
 export const deckStore = markRaw(new Storage('deck', {

packages/frontend/src/ui/deck/tl-column.vue

@@ -23,11 +23,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkTimeline
 		v-else-if="column.tl"
 		ref="timeline"
-		:key="column.tl + withRenotes + withReplies + onlyFiles"
+		:key="column.tl + withRenotes + withReplies + onlyFiles + onlyLocal"
 		:src="column.tl"
 		:withRenotes="withRenotes"
 		:withReplies="withReplies"
 		:onlyFiles="onlyFiles"
+		:onlyLocal="onlyLocal"
 	/>
 </XColumn>
 </template>
@@ -55,6 +56,7 @@ const isGlobalTimelineAvailable = (($i == null && instance.policies.gtlAvailable
 const withRenotes = ref(props.column.withRenotes ?? true);
 const withReplies = ref(props.column.withReplies ?? false);
 const onlyFiles = ref(props.column.onlyFiles ?? false);
+const onlyLocal = ref(props.column.onlyLocal ?? false);
 
 watch(withRenotes, v => {
 	updateColumn(props.column.id, {
@@ -74,6 +76,12 @@ watch(onlyFiles, v => {
 	});
 });
 
+watch(onlyLocal, v => {
+	updateColumn(props.column.id, {
+		onlyLocal: v,
+	});
+});
+
 onMounted(() => {
 	if (props.column.tl == null) {
 		setType();
@@ -126,7 +134,11 @@ const menu = [{
 	text: i18n.ts.fileAttachedOnly,
 	ref: onlyFiles,
 	disabled: props.column.tl === 'local' || props.column.tl === 'social' ? withReplies : false,
-}];
+}, props.column.tl === 'home' || props.column.tl === 'social' ? {
+	type: 'switch',
+	text: i18n.ts.localOnly,
+	ref: onlyLocal,
+} : undefined];
 </script>
 
 <style lang="scss" module>

packages/misskey-js/src/autogen/types.ts

@@ -20805,6 +20805,8 @@ export type operations = {
           withRenotes?: boolean;
           /** @default false */
           withReplies?: boolean;
+          /** @default false */
+          onlyLocal?: boolean;
         };
       };
     };
@@ -21773,6 +21775,8 @@ export type operations = {
           withFiles?: boolean;
           /** @default true */
           withRenotes?: boolean;
+          /** @default false */
+          onlyLocal?: boolean;
         };
       };
     };