Merge branch 'develop'

1 files changed, 0 insertions, 40 deletions

diff --git a/src/server/api/common/generate-muted-user-query.ts b/src/server/api/common/generate-muted-user-query.ts
deleted file mode 100644
index 7e200b87ef..0000000000
--- a/src/server/api/common/generate-muted-user-query.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { User } from '@/models/entities/user';
-import { Mutings } from '@/models/index';
-import { SelectQueryBuilder, Brackets } from 'typeorm';
-
-export function generateMutedUserQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }, exclude?: User) {
-	const mutingQuery = Mutings.createQueryBuilder('muting')
-		.select('muting.muteeId')
-		.where('muting.muterId = :muterId', { muterId: me.id });
-
-	if (exclude) {
-		mutingQuery.andWhere('muting.muteeId != :excludeId', { excludeId: exclude.id });
-	}
-
-	// 投稿の作者をミュートしていない かつ
-	// 投稿の返信先の作者をミュートしていない かつ
-	// 投稿の引用元の作者をミュートしていない
-	q
-		.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`)
-		.andWhere(new Brackets(qb => { qb
-			.where(`note.replyUserId IS NULL`)
-			.orWhere(`note.replyUserId NOT IN (${ mutingQuery.getQuery() })`);
-		}))
-		.andWhere(new Brackets(qb => { qb
-			.where(`note.renoteUserId IS NULL`)
-			.orWhere(`note.renoteUserId NOT IN (${ mutingQuery.getQuery() })`);
-		}));
-
-	q.setParameters(mutingQuery.getParameters());
-}
-
-export function generateMutedUserQueryForUsers(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
-	const mutingQuery = Mutings.createQueryBuilder('muting')
-		.select('muting.muteeId')
-		.where('muting.muterId = :muterId', { muterId: me.id });
-
-	q
-		.andWhere(`user.id NOT IN (${ mutingQuery.getQuery() })`);
-
-	q.setParameters(mutingQuery.getParameters());
-}