feat(notes): no blocking user on my note search & etc.

packages/backend/src/core/SearchService.ts

@@ -351,15 +351,18 @@ export class SearchService {
 			if (noteIds.length === 0) return [];
 			const [
 				userIdsWhoMeMuting,
+				userIdsWhoMeBlocking,
 				userIdsWhoBlockingMe,
 			] = me ? await Promise.all([
 				this.cacheService.userMutingsCache.fetch(me.id),
+				this.cacheService.userBlockingCache.fetch(me.id),
 				this.cacheService.userBlockedCache.fetch(me.id),
-			]) : [new Set<string>(), new Set<string>()];
+			]) : [new Set<string>(), new Set<string>(), new Set<string>()];
 			const notes = (await this.notesRepository.findBy({
 				id: In(noteIds),
 			})).filter(note => {
 				if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
+				if (me && isUserRelated(note, userIdsWhoMeBlocking)) return false;
 				if (me && isUserRelated(note, userIdsWhoMeMuting)) return false;
 				return true;
 			});
@@ -391,8 +394,11 @@ export class SearchService {
 			}
 
 			this.queryService.generateVisibilityQuery(query, me);
-			if (me) this.queryService.generateMutedUserQuery(query, me);
+			if (me) {
-			if (me) this.queryService.generateBlockedUserQuery(query, me);
+				this.queryService.generateMutedUserQuery(query, me);
+				this.queryService.generateBlockingUserQuery(query, me);
+				this.queryService.generateBlockedUserQuery(query, me);
+			}
 
 			return await query.limit(pagination.limit).getMany();
 		}

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

@@ -115,6 +115,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateMutedUserQuery(query, me);
+			this.queryService.generateBlockingUserQuery(query, me);
 			this.queryService.generateBlockedUserQuery(query, me);
 
 			const notes = await query.getMany();

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

@@ -88,6 +88,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			if (me) {
 				this.queryService.generateVisibilityQuery(query, me);
 				this.queryService.generateMutedUserQuery(query, me);
+				this.queryService.generateBlockingUserQuery(query, me);
 				this.queryService.generateBlockedUserQuery(query, me);
 			}
 

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

@@ -72,6 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.queryService.generateVisibilityQuery(query, me);
 			if (me) {
 				this.queryService.generateMutedUserQuery(query, me);
+				this.queryService.generateBlockingUserQuery(query, me);
 				this.queryService.generateBlockedUserQuery(query, me);
 			}
 

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

@@ -87,6 +87,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateVisibilityQuery(query, me);
 			if (me) this.queryService.generateMutedUserQuery(query, me);
+			if (me) this.queryService.generateBlockingUserQuery(query, me);
 			if (me) this.queryService.generateBlockedUserQuery(query, me);
 
 			const notes = await query.getMany();

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

@@ -69,6 +69,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateMutedUserQuery(query, me);
+			this.queryService.generateBlockingUserQuery(query, me);
 			this.queryService.generateMutedNoteThreadQuery(query, me);
 			this.queryService.generateBlockedUserQuery(query, me);
 

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

@@ -72,8 +72,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			if (me) this.queryService.generateMutedUserQuery(query, me);
+			if (me) {
-			if (me) this.queryService.generateBlockedUserQuery(query, me);
+				this.queryService.generateMutedUserQuery(query, me);
+				this.queryService.generateBlockingUserQuery(query, me);
+				this.queryService.generateBlockedUserQuery(query, me);
+			}
 
 			const renotes = await query.limit(ps.limit).getMany();
 

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

@@ -56,8 +56,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			if (me) this.queryService.generateMutedUserQuery(query, me);
+			if (me) {
-			if (me) this.queryService.generateBlockedUserQuery(query, me);
+				this.queryService.generateMutedUserQuery(query, me);
+				this.queryService.generateBlockingUserQuery(query, me);
+				this.queryService.generateBlockedUserQuery(query, me);
+			}
 
 			const timeline = await query.limit(ps.limit).getMany();
 

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

@@ -82,8 +82,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
-			if (me) this.queryService.generateMutedUserQuery(query, me);
+			if (me) {
-			if (me) this.queryService.generateBlockedUserQuery(query, me);
+				this.queryService.generateMutedUserQuery(query, me);
+				this.queryService.generateBlockingUserQuery(query, me);
+				this.queryService.generateBlockedUserQuery(query, me);
+			}
 
 			try {
 				if (ps.tag) {

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

@@ -187,6 +187,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateMutedUserQuery(query, me);
+		this.queryService.generateBlockingUserQuery(query, me);
 		this.queryService.generateBlockedUserQuery(query, me);
 		this.queryService.generateMutedUserRenotesQueryForNotes(query, me);