diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-06-02 22:56:35 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-06-02 23:48:12 -0400 |
| commit | 7ab5ce1537feb47480a47e4f3faab16d089820f1 (patch) | |
| tree | 03b42bd205c34e3829803c23957c40f48d96cdaf /packages/backend/src/core/QueryService.ts | |
| parent | fix andWhere/orWhere in QueryService.ts (diff) | |
| download | sharkey-7ab5ce1537feb47480a47e4f3faab16d089820f1.tar.gz sharkey-7ab5ce1537feb47480a47e4f3faab16d089820f1.tar.bz2 sharkey-7ab5ce1537feb47480a47e4f3faab16d089820f1.zip | |
replace generateBlockedHostQueryForNote allowSilenced parameter with generateSilencedUserQueryForNotes
Diffstat (limited to 'packages/backend/src/core/QueryService.ts')
| -rw-r--r-- | packages/backend/src/core/QueryService.ts | 17 |
1 files changed, 3 insertions, 14 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'); })); }; |