Merge branch 'master' into develop

This commit is contained in:
syuilo
2020-03-31 08:08:22 +09:00
4 changed files with 10 additions and 5 deletions

View File

@ -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);

View File

@ -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,