diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-03-31 08:08:22 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-03-31 08:08:22 +0900 |
| commit | 10356b4041d50acf1019a49f8b4c35d373315162 (patch) | |
| tree | 9c9c61797af05c2e2aa681603240e2131b13972d /src/server/api/endpoints | |
| parent | APIの権限設定漏れを修正 (#6202) (diff) | |
| parent | Fix #6203 (diff) | |
| download | sharkey-10356b4041d50acf1019a49f8b4c35d373315162.tar.gz sharkey-10356b4041d50acf1019a49f8b4c35d373315162.tar.bz2 sharkey-10356b4041d50acf1019a49f8b4c35d373315162.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/admin/accounts/create.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/meta.ts | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/api/endpoints/admin/accounts/create.ts b/src/server/api/endpoints/admin/accounts/create.ts index 16fe3e36da..98e5642bed 100644 --- a/src/server/api/endpoints/admin/accounts/create.ts +++ b/src/server/api/endpoints/admin/accounts/create.ts @@ -17,7 +17,9 @@ export const meta = { }; export default define(meta, async (ps, me) => { - const noUsers = (await Users.count({})) === 0; + const noUsers = (await Users.count({ + host: null, + })) === 0; if (!noUsers && !me?.isAdmin) throw new Error('access denied'); const { account, secret } = await signup(ps.username, ps.password); diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 41adc855d2..0cb6f75f11 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -137,7 +137,9 @@ export default define(meta, async (ps, me) => { category: e.category, url: e.url, })), - requireSetup: (await Users.count({})) === 0, + requireSetup: (await Users.count({ + host: null, + })) === 0, enableEmail: instance.enableEmail, enableTwitterIntegration: instance.enableTwitterIntegration, |