Merge branch 'develop' into merge/2024-02-03

# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
This commit is contained in:
Hazelnoot 2025-02-07 11:54:29 -05:00
commit f36029f795
24 changed files with 512 additions and 35 deletions

View file

@ -0,0 +1,11 @@
export class AddUserProfileDefaultCw1738446745738 {
name = 'AddUserProfileDefaultCw1738446745738'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "user_profile" ADD "default_cw" text`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "default_cw"`);
}
}

View file

@ -0,0 +1,13 @@
export class AddUserProfileDefaultCwPriority1738468079662 {
name = 'AddUserProfileDefaultCwPriority1738468079662'
async up(queryRunner) {
await queryRunner.query(`CREATE TYPE "public"."user_profile_default_cw_priority_enum" AS ENUM ('default', 'parent', 'defaultParent', 'parentDefault')`);
await queryRunner.query(`ALTER TABLE "user_profile" ADD "default_cw_priority" "public"."user_profile_default_cw_priority_enum" NOT NULL DEFAULT 'parent'`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "default_cw_priority"`);
await queryRunner.query(`DROP TYPE "public"."user_profile_default_cw_priority_enum"`);
}
}