diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 39b3d9a3c..563ad5c95 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1640,7 +1640,7 @@ _pages: _for: arg1: "回数" arg2: "処理" - typeError: 'スロット{slot}は"{expect}"を受け付けますが、"{actual}"が入れられています!' + typeError: "スロット{slot}は\"{expect}\"を受け付けますが、\"{actual}\"が入れられています!" thereIsEmptySlot: "スロット{slot}が空です!" types: string: "テキスト" diff --git a/packages/backend/src/models/entities/user-profile.ts b/packages/backend/src/models/entities/user-profile.ts index 24498f807..0f923bffb 100644 --- a/packages/backend/src/models/entities/user-profile.ts +++ b/packages/backend/src/models/entities/user-profile.ts @@ -9,43 +9,39 @@ import { ffVisibility, notificationTypes } from '@/types.js'; @Entity() export class UserProfile { @PrimaryColumn(id()) - public userId: User["id"]; + public userId: User['id']; - @OneToOne((type) => User, { - onDelete: "CASCADE", + @OneToOne(type => User, { + onDelete: 'CASCADE', }) @JoinColumn() public user: User | null; - @Column("varchar", { - length: 128, - nullable: true, - comment: "The location of the User.", - }) - public location: string | null; - - @Column("varchar", { - length: 20, - nullable: true, - comment: "The pronouns of the User.", + @Column('varchar', { + length: 32, nullable: true, + comment: 'The pronouns of the User.', }) public pronouns: string | null; - @Column("char", { - length: 10, - nullable: true, - comment: "The birthday (YYYY-MM-DD) of the User.", + @Column('varchar', { + length: 128, nullable: true, + comment: 'The location of the User.', + }) + public location: string | null; + + @Column('char', { + length: 10, nullable: true, + comment: 'The birthday (YYYY-MM-DD) of the User.', }) public birthday: string | null; - @Column("varchar", { - length: 2048, - nullable: true, - comment: "The description (bio) of the User.", + @Column('varchar', { + length: 2048, nullable: true, + comment: 'The description (bio) of the User.', }) public description: string | null; - @Column("jsonb", { + @Column('jsonb', { default: [], }) public fields: { @@ -53,129 +49,121 @@ export class UserProfile { value: string; }[]; - @Column("varchar", { - length: 32, - nullable: true, + @Column('varchar', { + length: 32, nullable: true, }) public lang: string | null; - @Column("varchar", { - length: 512, - nullable: true, - comment: "Remote URL of the user.", + @Column('varchar', { + length: 512, nullable: true, + comment: 'Remote URL of the user.', }) public url: string | null; - @Column("varchar", { - length: 128, - nullable: true, - comment: "The email address of the User.", + @Column('varchar', { + length: 128, nullable: true, + comment: 'The email address of the User.', }) public email: string | null; - @Column("varchar", { - length: 128, - nullable: true, + @Column('varchar', { + length: 128, nullable: true, }) public emailVerifyCode: string | null; - @Column("boolean", { + @Column('boolean', { default: false, }) public emailVerified: boolean; - @Column("jsonb", { - default: ["follow", "receiveFollowRequest", "groupInvited"], + @Column('jsonb', { + default: ['follow', 'receiveFollowRequest', 'groupInvited'], }) public emailNotificationTypes: string[]; - @Column("boolean", { + @Column('boolean', { default: false, }) public publicReactions: boolean; - @Column("enum", { + @Column('enum', { enum: ffVisibility, - default: "public", + default: 'public', }) public ffVisibility: typeof ffVisibility[number]; - @Column("varchar", { - length: 128, - nullable: true, + @Column('varchar', { + length: 128, nullable: true, }) public twoFactorTempSecret: string | null; - @Column("varchar", { - length: 128, - nullable: true, + @Column('varchar', { + length: 128, nullable: true, }) public twoFactorSecret: string | null; - @Column("boolean", { + @Column('boolean', { default: false, }) public twoFactorEnabled: boolean; - @Column("boolean", { + @Column('boolean', { default: false, }) public securityKeysAvailable: boolean; - @Column("boolean", { + @Column('boolean', { default: false, }) public usePasswordLessLogin: boolean; - @Column("varchar", { - length: 128, - nullable: true, - comment: - "The password hash of the User. It will be null if the origin of the user is local.", + @Column('varchar', { + length: 128, nullable: true, + comment: 'The password hash of the User. It will be null if the origin of the user is local.', }) public password: string | null; // TODO: そのうち消す - @Column("jsonb", { + @Column('jsonb', { default: {}, - comment: "The client-specific data of the User.", + comment: 'The client-specific data of the User.', }) public clientData: Record; // TODO: そのうち消す - @Column("jsonb", { + @Column('jsonb', { default: {}, - comment: "The room data of the User.", + comment: 'The room data of the User.', }) public room: Record; - @Column("boolean", { + @Column('boolean', { default: false, }) public autoAcceptFollowed: boolean; - @Column("boolean", { + @Column('boolean', { default: false, - comment: "Whether reject index by crawler.", + comment: 'Whether reject index by crawler.', }) public noCrawle: boolean; - @Column("boolean", { + @Column('boolean', { default: false, }) public alwaysMarkNsfw: boolean; - @Column("boolean", { + @Column('boolean', { default: false, }) public carefulBot: boolean; - @Column("boolean", { + @Column('boolean', { default: true, }) public injectFeaturedNote: boolean; - @Column("boolean", { + @Column('boolean', { default: true, }) public receiveAnnouncementEmail: boolean; @@ -184,38 +172,37 @@ export class UserProfile { ...id(), nullable: true, }) - public pinnedPageId: Page["id"] | null; + public pinnedPageId: Page['id'] | null; - @OneToOne((type) => Page, { - onDelete: "SET NULL", + @OneToOne(type => Page, { + onDelete: 'SET NULL', }) @JoinColumn() public pinnedPage: Page | null; - @Column("jsonb", { + @Column('jsonb', { default: {}, }) public integrations: Record; @Index() - @Column("boolean", { - default: false, - select: false, + @Column('boolean', { + default: false, select: false, }) public enableWordMute: boolean; - @Column("jsonb", { + @Column('jsonb', { default: [], }) public mutedWords: string[][]; - @Column("jsonb", { + @Column('jsonb', { default: [], - comment: "List of instances muted by the user.", + comment: 'List of instances muted by the user.', }) public mutedInstances: string[]; - @Column("enum", { + @Column('enum', { enum: notificationTypes, array: true, default: [], @@ -224,10 +211,9 @@ export class UserProfile { //#region Denormalized fields @Index() - @Column("varchar", { - length: 128, - nullable: true, - comment: "[Denormalized]", + @Column('varchar', { + length: 128, nullable: true, + comment: '[Denormalized]', }) public userHost: string | null; //#endregion