Merge remote-tracking branch 'mi-dev/develop' into emoji

# Conflicts: # CHANGELOG.md # packages/misskey-js/etc/misskey-js.api.md
2023-10-22 21:06:59 +09:00 · 2023-10-22 21:06:59 +09:00 · b511ab2199
commit b511ab2199
parent c15ac05800 230b4318bd
26 changed files with 323 additions and 57 deletions
--- a/packages/backend/src/models/User.ts
+++ b/packages/backend/src/models/User.ts
@ -138,10 +138,14 @@ export class MiUser {
 	})
 	public bannerBlurhash: string | null;

-	@Column('varchar', {
-		length: 512, array: true, default: '{}',
+	@Column('jsonb', {
+		default: [],
 	})
-	public avatarDecorations: string[];
+	public avatarDecorations: {
+		id: string;
+		angle: number;
+		flipH: boolean;
+	}[];

 	@Index()
 	@Column('varchar', {
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@ -54,6 +54,14 @@ export const packedUserLiteSchema = {
 						format: 'url',
 						nullable: false, optional: false,
 					},
+					angle: {
+						type: 'number',
+						nullable: false, optional: true,
+					},
+					flipH: {
+						type: 'boolean',
+						nullable: false, optional: true,
+					},
 				},
 			},
 		},