diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-09-28 18:15:32 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-28 18:15:32 +0900 |
| commit | f0d0cd2e5042fb30cf3ef1c2717540391ee97aac (patch) | |
| tree | 13fd1980e127ac4f762ea7a9e6d4bf73fac8a888 /packages/backend/src/server/api/endpoints/ap/show.ts | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-f0d0cd2e5042fb30cf3ef1c2717540391ee97aac.tar.gz sharkey-f0d0cd2e5042fb30cf3ef1c2717540391ee97aac.tar.bz2 sharkey-f0d0cd2e5042fb30cf3ef1c2717540391ee97aac.zip | |
wip (#14643)
Diffstat (limited to 'packages/backend/src/server/api/endpoints/ap/show.ts')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/ap/show.ts | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts index 577ca0b24c..c52608cefb 100644 --- a/packages/backend/src/server/api/endpoints/ap/show.ts +++ b/packages/backend/src/server/api/endpoints/ap/show.ts @@ -19,8 +19,6 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { bindThis } from '@/decorators.js'; import { ApiError } from '../../error.js'; -import { MiMeta } from '@/models/_.js'; -import { DI } from '@/di-symbols.js'; export const meta = { tags: ['federation'], @@ -89,9 +87,6 @@ export const paramDef = { @Injectable() export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export constructor( - @Inject(DI.meta) - private serverSettings: MiMeta, - private utilityService: UtilityService, private userEntityService: UserEntityService, private noteEntityService: NoteEntityService, @@ -115,8 +110,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- */ @bindThis private async fetchAny(uri: string, me: MiLocalUser | null | undefined): Promise<SchemaType<typeof meta['res']> | null> { - // ブロックしてたら中断 - if (this.utilityService.isBlockedHost(this.serverSettings.blockedHosts, this.utilityService.extractDbHost(uri))) return null; + if (!this.utilityService.isFederationAllowedUri(uri)) return null; let local = await this.mergePack(me, ...await Promise.all([ this.apDbResolverService.getUserFromApId(uri), |