Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge a42c5e4534 into 794cb9ffe2

Browse source
This commit is contained in:
かっこかり 2024-11-07 17:41:42 +09:00 • committed by GitHub
commit bec286c7a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 1353 additions and 943 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/backend/migration/1708933788259-canSkipInitialTutorial.js Normal file
View file

@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
export class CanSkipInitialTutorial1708933788259 {
name = 'CanSkipInitialTutorial1708933788259'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" ADD "canSkipInitialTutorial" boolean NOT NULL DEFAULT true`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "canSkipInitialTutorial"`);
}
}

1
packages/backend/src/core/entities/MetaEntityService.ts
View file

@ -87,6 +87,7 @@ export class MetaEntityService {
inquiryUrl: instance.inquiryUrl,
disableRegistration: instance.disableRegistration,
emailRequiredForSignup: instance.emailRequiredForSignup,
canSkipInitialTutorial: instance.canSkipInitialTutorial,
enableHcaptcha: instance.enableHcaptcha,
hcaptchaSiteKey: instance.hcaptchaSiteKey,
enableMcaptcha: instance.enableMcaptcha,

5
packages/backend/src/models/Meta.ts
View file

@ -189,6 +189,11 @@ export class MiMeta {
})
public emailRequiredForSignup: boolean;
@Column('boolean', {
default: true,
})
public canSkipInitialTutorial: boolean;
@Column('boolean', {
default: false,
})

4
packages/backend/src/models/json-schema/meta.ts
View file

@ -79,6 +79,10 @@ export const packedMetaLiteSchema = {
type: 'boolean',
optional: false, nullable: false,
},
canSkipInitialTutorial: {
type: 'boolean',
optional: false, nullable: false,
},
enableHcaptcha: {
type: 'boolean',
optional: false, nullable: false,

5
packages/backend/src/server/api/endpoints/admin/meta.ts
View file

@ -33,6 +33,10 @@ export const meta = {
type: 'boolean',
optional: false, nullable: false,
},
canSkipInitialTutorial: {
type: 'boolean',
optional: false, nullable: false,
},
enableHcaptcha: {
type: 'boolean',
optional: false, nullable: false,
@ -561,6 +565,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
inquiryUrl: instance.inquiryUrl,
disableRegistration: instance.disableRegistration,
emailRequiredForSignup: instance.emailRequiredForSignup,
canSkipInitialTutorial: instance.canSkipInitialTutorial,
enableHcaptcha: instance.enableHcaptcha,
hcaptchaSiteKey: instance.hcaptchaSiteKey,
enableMcaptcha: instance.enableMcaptcha,

5
packages/backend/src/server/api/endpoints/admin/update-meta.ts
View file

@ -70,6 +70,7 @@ export const paramDef = {
cacheRemoteFiles: { type: 'boolean' },
cacheRemoteSensitiveFiles: { type: 'boolean' },
emailRequiredForSignup: { type: 'boolean' },
canSkipInitialTutorial: { type: 'boolean' },
enableHcaptcha: { type: 'boolean' },
hcaptchaSiteKey: { type: 'string', nullable: true },
hcaptchaSecretKey: { type: 'string', nullable: true },
@ -315,6 +316,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
set.emailRequiredForSignup = ps.emailRequiredForSignup;
}
if (ps.canSkipInitialTutorial !== undefined) {
set.canSkipInitialTutorial = ps.canSkipInitialTutorial;
}
if (ps.enableHcaptcha !== undefined) {
set.enableHcaptcha = ps.enableHcaptcha;
}