diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-01-13 18:21:07 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-13 18:21:07 +0900 |
| commit | 303519a1bd93710938ab19335974608bd9bacabd (patch) | |
| tree | be0ad8d9c4fe2ea8200962fb44c6f57f57014840 /packages/backend/src/queue | |
| parent | fix(server): signup-complete Broken (diff) | |
| download | sharkey-303519a1bd93710938ab19335974608bd9bacabd.tar.gz sharkey-303519a1bd93710938ab19335974608bd9bacabd.tar.bz2 sharkey-303519a1bd93710938ab19335974608bd9bacabd.zip | |
enhance: Judge instance block by endsWith (#9263)
* TypeScriptでendsWith
* fix
* SQL?
* バ〜カアホ
* Update packages/backend/src/core/UtilityService.ts
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* add comment
* add description
* Update packages/backend/src/core/UtilityService.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* Update packages/backend/src/core/chart/charts/federation.ts
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* remove comment
* fix
* fix?
* add changelog
* ILIKE, ARRAY
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/queue')
| -rw-r--r-- | packages/backend/src/queue/processors/DeliverProcessorService.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/queue/processors/InboxProcessorService.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts index c5e4a66517..10fcb5684f 100644 --- a/packages/backend/src/queue/processors/DeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts @@ -56,7 +56,7 @@ export class DeliverProcessorService { // ブロックしてたら中断 const meta = await this.metaService.fetch(); - if (meta.blockedHosts.includes(this.utilityService.toPuny(host))) { + if (this.utilityService.isBlockedHost(meta.blockedHosts, this.utilityService.toPuny(host))) { return 'skip (blocked)'; } diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index d033637849..f814368a7a 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -76,7 +76,7 @@ export class InboxProcessorService { // ブロックしてたら中断 const meta = await this.metaService.fetch(); - if (meta.blockedHosts.includes(host)) { + if (this.utilityService.isBlockedHost(meta.blockedHosts, host)) { return `Blocked request: ${host}`; } @@ -158,7 +158,7 @@ export class InboxProcessorService { // ブロックしてたら中断 const ldHost = this.utilityService.extractDbHost(authUser.user.uri); - if (meta.blockedHosts.includes(ldHost)) { + if (this.utilityService.isBlockedHost(meta.blockedHosts, ldHost)) { return `Blocked request: ${ldHost}`; } } else { |