refactor: ミュート・ブロックのためのクエリ呼び出しを一つの関数にまとめる

packages/backend/src/core/QueryService.ts

@@ -77,6 +77,40 @@ export class QueryService {
 		return q;
 	}
 
+	/**
+	 * ミュートやブロックのようにすべてのタイムラインで共通に使用するフィルターを定義します。
+	 *
+	 * 特別な事情がない限り、各タイムラインはこの関数を呼び出してフィルターを適用してください。
+	 *
+	 * Notes for future maintainers:
+	 * 1) この関数で生成するクエリと同等の処理が FanoutTimelineEndpointService にあります。
+	 *    この関数を変更した場合、FanoutTimelineEndpointService の方も変更する必要があります。
+	 * 2) 以下のエンドポイントでは特別な事情があるため queryService のそれぞれの関数を呼び出しています。
+	 *    この関数を変更した場合、以下のエンドポイントの方も変更する必要があることがあります。
+	 *    - packages/backend/src/server/api/endpoints/clips/notes.ts
+	 */
+	@bindThis
+	public generateBaseNoteFilteringQuery(
+		query: SelectQueryBuilder<any>,
+		me: { id: MiUser['id'] } | null,
+		{
+			excludeUserFromMute,
+			excludeAuthor,
+		}: {
+			excludeUserFromMute?: MiUser['id'],
+			excludeAuthor?: boolean,
+		},
+	): void {
+		this.generateBlockedHostQueryForNote(query, excludeAuthor);
+		this.generateSuspendedUserQueryForNote(query, excludeAuthor);
+		if (me) {
+			this.generateMutedUserQueryForNotes(query, me, { excludeUserFromMute });
+			this.generateBlockedUserQueryForNotes(query, me);
+			this.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote', excludeUserFromMute });
+			this.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
+		}
+	}
+
 	// ここでいうBlockedは被Blockedの意
 	@bindThis
 	public generateBlockedUserQueryForNotes(

packages/backend/src/core/SearchService.ts

@@ -234,12 +234,7 @@ export class SearchService {
 		}
 
 		this.queryService.generateVisibilityQuery(query, me);
-		this.queryService.generateBlockedHostQueryForNote(query);
+		this.queryService.generateBaseNoteFilteringQuery(query, me);
-		this.queryService.generateSuspendedUserQueryForNote(query);
-		if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
-		if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
-		if (me) this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-		if (me) this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 
 		return query.limit(pagination.limit).getMany();
 	}

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

@@ -111,13 +111,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// NOTE: センシティブ除外の設定はこのエンドポイントでは無視する。
 			// https://github.com/misskey-dev/misskey/pull/15346#discussion_r1929950255
 
-			this.queryService.generateBlockedHostQueryForNote(query);
-			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateMutedUserQueryForNotes(query, me);
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-			this.queryService.generateBlockedUserQueryForNotes(query, me);
-			this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 
 			const notes = await query.getMany();
 			if (sinceId != null && untilId == null) {

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

@@ -121,14 +121,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('renote.user', 'renoteUser')
 			.leftJoinAndSelect('note.channel', 'channel');
 
-		this.queryService.generateBlockedHostQueryForNote(query);
+		this.queryService.generateBaseNoteFilteringQuery(query, me);
-		this.queryService.generateSuspendedUserQueryForNote(query);
-		if (me) {
-			this.queryService.generateMutedUserQueryForNotes(query, me);
-			this.queryService.generateBlockedUserQueryForNotes(query, me);
-			this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-		}
 		//#endregion
 
 		return await query.limit(ps.limit).getMany();

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

@@ -70,14 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-			this.queryService.generateSuspendedUserQueryForNote(query);
-			if (me) {
-				this.queryService.generateMutedUserQueryForNotes(query, me);
-				this.queryService.generateBlockedUserQueryForNotes(query, me);
-				this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-				this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			}
 
 			const notes = await query.limit(ps.limit).getMany();
 

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

@@ -78,13 +78,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
-			if (me) {
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-				this.queryService.generateMutedUserQueryForNotes(query, me);
+			if (me) this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
-				this.queryService.generateBlockedUserQueryForNotes(query, me);
-				this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-				this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-				this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
-			}
 
 			if (ps.withFiles) {
 				query.andWhere('note.fileIds != \'{}\'');

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

@@ -243,12 +243,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		}
 
 		this.queryService.generateVisibilityQuery(query, me);
-		this.queryService.generateBlockedHostQueryForNote(query);
+		this.queryService.generateBaseNoteFilteringQuery(query, me);
-		this.queryService.generateSuspendedUserQueryForNote(query);
-		this.queryService.generateMutedUserQueryForNotes(query, me);
-		this.queryService.generateBlockedUserQueryForNotes(query, me);
-		this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-		this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 		this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
 
 		if (ps.includeMyRenotes === false) {

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

@@ -156,12 +156,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('renote.user', 'renoteUser');
 
 		this.queryService.generateVisibilityQuery(query, me);
-		this.queryService.generateBlockedHostQueryForNote(query);
+		this.queryService.generateBaseNoteFilteringQuery(query, me);
-		this.queryService.generateSuspendedUserQueryForNote(query);
-		if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
-		if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
-		if (me) this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-		if (me) this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 		if (me) this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
 
 		if (ps.withFiles) {

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

@@ -72,13 +72,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-			this.queryService.generateSuspendedUserQueryForNote(query);
-			this.queryService.generateMutedUserQueryForNotes(query, me);
 			this.queryService.generateMutedNoteThreadQuery(query, me);
-			this.queryService.generateBlockedUserQueryForNotes(query, me);
-			this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 
 			if (ps.visibility) {
 				query.andWhere('note.visibility = :visibility', { visibility: ps.visibility });

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

@@ -72,12 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-			this.queryService.generateSuspendedUserQueryForNote(query);
-			if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
-			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
-			if (me) this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 
 			const renotes = await query.limit(ps.limit).getMany();
 

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

@@ -56,12 +56,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-			this.queryService.generateSuspendedUserQueryForNote(query);
-			if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
-			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
-			if (me) this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 
 			const timeline = await query.limit(ps.limit).getMany();
 

packages/backend/src/server/api/endpoints/notes/search-by-tag.ts

@@ -81,12 +81,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-			this.queryService.generateSuspendedUserQueryForNote(query);
-			if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
-			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
-			if (me) this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 
 			try {
 				if (ps.tag) {

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

@@ -199,12 +199,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		}));
 
 		this.queryService.generateVisibilityQuery(query, me);
-		this.queryService.generateBlockedHostQueryForNote(query);
+		this.queryService.generateBaseNoteFilteringQuery(query, me);
-		this.queryService.generateSuspendedUserQueryForNote(query);
-		this.queryService.generateMutedUserQueryForNotes(query, me);
-		this.queryService.generateBlockedUserQueryForNotes(query, me);
-		this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-		this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 		this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
 
 		if (ps.includeMyRenotes === false) {

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

@@ -184,12 +184,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}));
 
 		this.queryService.generateVisibilityQuery(query, me);
-		this.queryService.generateBlockedHostQueryForNote(query);
+		this.queryService.generateBaseNoteFilteringQuery(query, me);
-		this.queryService.generateSuspendedUserQueryForNote(query);
-		this.queryService.generateMutedUserQueryForNotes(query, me);
-		this.queryService.generateBlockedUserQueryForNotes(query, me);
-		this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-		this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 		this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
 
 		if (ps.includeMyRenotes === false) {

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

@@ -102,12 +102,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateBaseNoteFilteringQuery(query, me);
-			this.queryService.generateSuspendedUserQueryForNote(query);
-			this.queryService.generateMutedUserQueryForNotes(query, me);
-			this.queryService.generateBlockedUserQueryForNotes(query, me);
-			this.queryService.generateMutedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-			this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
 
 			const notes = await query.getMany();
 			notes.sort((a, b) => a.id > b.id ? -1 : 1);

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

@@ -186,14 +186,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		}
 
 		this.queryService.generateVisibilityQuery(query, me);
-		this.queryService.generateBlockedHostQueryForNote(query, true);
+		this.queryService.generateBaseNoteFilteringQuery(query, me, {
-		this.queryService.generateSuspendedUserQueryForNote(query, true);
+			excludeAuthor: true,
-		if (me) {
+			excludeUserFromMute: ps.userId,
-			this.queryService.generateMutedUserQueryForNotes(query, me, { excludeUserFromMute: ps.userId });
+		});
-			this.queryService.generateMutedUserQueryForNotes(query, me, { excludeUserFromMute: ps.userId, noteColumn: 'renote' });
-			this.queryService.generateBlockedUserQueryForNotes(query, me);
-			this.queryService.generateBlockedUserQueryForNotes(query, me, { noteColumn: 'renote' });
-		}
 
 		if (ps.withFiles) {
 			query.andWhere('note.fileIds != \'{}\'');