Merge branch 'master' into users-fix2

2 files changed, 12 insertions, 1 deletions

diff --git a/src/util/entities/ApplicationCommand.ts b/src/util/entities/ApplicationCommand.ts

index 82436f7a..8ec154f8 100644
--- a/src/util/entities/ApplicationCommand.ts
+++ b/src/util/entities/ApplicationCommand.ts
@@ -53,7 +53,7 @@ export class ApplicationCommand extends BaseClass {
 	@Column({ nullable: true, type: "simple-json" })
 	description_localizations?: Record<string, string>;
 
-	@Column({ type: "simple-json", default: [] })
+	@Column({ type: "simple-json", default: "[]" })
 	options: ApplicationCommandOption[];
 
 	@Column({ nullable: true, type: String })
diff --git a/src/util/migration/postgres/1762611552514-fix-gif-stickers-format_type.ts b/src/util/migration/postgres/1762611552514-fix-gif-stickers-format_type.ts
new file mode 100644

index 00000000..47de7506
--- /dev/null
+++ b/src/util/migration/postgres/1762611552514-fix-gif-stickers-format_type.ts
@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class FixGifStickersFormatType1762611552514 implements MigrationInterface {
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(`UPDATE "stickers" SET "format_type" = 4 WHERE "format_type" = 0;`);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(`UPDATE "stickers" SET "format_type" = 0 WHERE "format_type" = 4;`);
+	}
+}