summaryrefslogtreecommitdiff
path: root/src/server/api/common/generate-block-query.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-11-12 02:02:25 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-11-12 02:02:25 +0900
commit0e4a111f81cceed275d9bec2695f6e401fb654d8 (patch)
tree40874799472fa07416f17b50a398ac33b7771905 /src/server/api/common/generate-block-query.ts
parentupdate deps (diff)
downloadsharkey-0e4a111f81cceed275d9bec2695f6e401fb654d8.tar.gz
sharkey-0e4a111f81cceed275d9bec2695f6e401fb654d8.tar.bz2
sharkey-0e4a111f81cceed275d9bec2695f6e401fb654d8.zip
refactoring
Resolve #7779
Diffstat (limited to 'src/server/api/common/generate-block-query.ts')
-rw-r--r--src/server/api/common/generate-block-query.ts42
1 files changed, 0 insertions, 42 deletions
diff --git a/src/server/api/common/generate-block-query.ts b/src/server/api/common/generate-block-query.ts
deleted file mode 100644
index 4fd6184738..0000000000
--- a/src/server/api/common/generate-block-query.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { User } from '@/models/entities/user';
-import { Blockings } from '@/models/index';
-import { Brackets, SelectQueryBuilder } from 'typeorm';
-
-// ここでいうBlockedは被Blockedの意
-export function generateBlockedUserQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
- const blockingQuery = Blockings.createQueryBuilder('blocking')
- .select('blocking.blockerId')
- .where('blocking.blockeeId = :blockeeId', { blockeeId: me.id });
-
- // 投稿の作者にブロックされていない かつ
- // 投稿の返信先の作者にブロックされていない かつ
- // 投稿の引用元の作者にブロックされていない
- q
- .andWhere(`note.userId NOT IN (${ blockingQuery.getQuery() })`)
- .andWhere(new Brackets(qb => { qb
- .where(`note.replyUserId IS NULL`)
- .orWhere(`note.replyUserId NOT IN (${ blockingQuery.getQuery() })`);
- }))
- .andWhere(new Brackets(qb => { qb
- .where(`note.renoteUserId IS NULL`)
- .orWhere(`note.renoteUserId NOT IN (${ blockingQuery.getQuery() })`);
- }));
-
- q.setParameters(blockingQuery.getParameters());
-}
-
-export function generateBlockQueryForUsers(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
- const blockingQuery = Blockings.createQueryBuilder('blocking')
- .select('blocking.blockeeId')
- .where('blocking.blockerId = :blockerId', { blockerId: me.id });
-
- const blockedQuery = Blockings.createQueryBuilder('blocking')
- .select('blocking.blockerId')
- .where('blocking.blockeeId = :blockeeId', { blockeeId: me.id });
-
- q.andWhere(`user.id NOT IN (${ blockingQuery.getQuery() })`);
- q.setParameters(blockingQuery.getParameters());
-
- q.andWhere(`user.id NOT IN (${ blockedQuery.getQuery() })`);
- q.setParameters(blockedQuery.getParameters());
-}