replace generateBlockedHostQueryForNote allowSilenced parameter with generateSilencedUserQueryForNotes

2 files changed, 5 insertions, 15 deletions

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 0f74e7cab1..2e0a368bd7 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -190,9 +190,8 @@ export class QueryService {
 			.setParameters({ meId: me.id });
 	}
 
-	// TODO replace allowSilenced with matchingHostQuery
 	@bindThis
-	public generateBlockedHostQueryForNote<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, excludeAuthor?: boolean, allowSilenced = true): SelectQueryBuilder<E> {
+	public generateBlockedHostQueryForNote<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, excludeAuthor?: boolean): SelectQueryBuilder<E> {
 		const checkFor = (key: 'user' | 'replyUser' | 'renoteUser') => {
 			q.andWhere(new Brackets(qb => {
 				qb.orWhere(`note.${key}Host IS NULL`); // local
@@ -207,18 +206,8 @@ export class QueryService {
 					}
 				}
 
-				if (allowSilenced) {
-					// not blocked
-					this.excludeInstanceWhere(qb, `note.${key}Host`, {
-						isBlocked: false,
-					}, 'orWhere');
-				} else {
-					// not blocked or silenced
-					this.excludeInstanceWhere(qb, `note.${key}Host`, {
-						isBlocked: false,
-						isSilenced: false,
-					}, 'orWhere');
-				}
+				// not blocked
+				this.excludeInstanceWhere(qb, `note.${key}Host`, { isBlocked: false }, 'orWhere');
 			}));
 		};
 
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index 5c1ab0fb78..01bedd9b1d 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -96,7 +96,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			if (!this.serverSettings.enableBotTrending) query.andWhere('user.isBot = FALSE');
 
-			this.queryService.generateBlockedHostQueryForNote(query, undefined, false);
+			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateSilencedUserQueryForNotes(query, me);
 			if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
 			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
 			if (me) this.queryService.generateMutedUserRenotesQueryForNotes(query, me);