diff options
| author | Gianni Ceccarelli <dakkar@thenautilus.net> | 2024-02-04 11:46:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-04 20:46:28 +0900 |
| commit | bafef1f8b45b5117c4418f68160ea288135571c3 (patch) | |
| tree | f9cc04f687edcb14176e399e80d9942412c064b0 /packages/backend/src/server/api/endpoints/meta.ts | |
| parent | fix(backend): メール配信機能が無効ならばメールを送ること... (diff) | |
| download | sharkey-bafef1f8b45b5117c4418f68160ea288135571c3.tar.gz sharkey-bafef1f8b45b5117c4418f68160ea288135571c3.tar.bz2 sharkey-bafef1f8b45b5117c4418f68160ea288135571c3.zip | |
ignore `instance.actor` when checking if there are local users (#13146)
* ignore `instance.actor` when checking if there are local users
We've seen this happen a few times:
* there was some AP software at $some_domain
* it gets replaced by Misskey
* before the first user can be created, an AP activity comes in
* Misskey resolves the activity
* to do this, it creates the `instance.actor` to sign its request
* now there *is* a local user, so the `meta` endpoint returns
`requireSetup:false`
* the admin is very confused
This commit factors out the check, and doesn't count the
`instance.actor` as a real user.
* autogen bits
Diffstat (limited to 'packages/backend/src/server/api/endpoints/meta.ts')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/meta.ts | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index e1d3473482..c6489f67ac 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -6,11 +6,12 @@ import { IsNull, LessThanOrEqual, MoreThan, Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import JSON5 from 'json5'; -import type { AdsRepository, UsersRepository } from '@/models/_.js'; +import type { AdsRepository } from '@/models/_.js'; import { MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { MetaService } from '@/core/MetaService.js'; +import { InstanceActorService } from '@/core/InstanceActorService.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import { DEFAULT_POLICIES } from '@/core/RoleService.js'; @@ -326,14 +327,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- @Inject(DI.config) private config: Config, - @Inject(DI.usersRepository) - private usersRepository: UsersRepository, - @Inject(DI.adsRepository) private adsRepository: AdsRepository, private userEntityService: UserEntityService, private metaService: MetaService, + private instanceActorService: InstanceActorService, ) { super(meta, paramDef, async (ps, me) => { const instance = await this.metaService.fetch(true); @@ -412,9 +411,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- ...(ps.detail ? { cacheRemoteFiles: instance.cacheRemoteFiles, cacheRemoteSensitiveFiles: instance.cacheRemoteSensitiveFiles, - requireSetup: (await this.usersRepository.countBy({ - host: IsNull(), - })) === 0, + requireSetup: !await this.instanceActorService.realLocalUsersPresent(), } : {}), }; |