From 03aa41664fb284fabdae2e958c64a3f4091ffcfb Mon Sep 17 00:00:00 2001 From: Johann150 Date: Thu, 2 Jun 2022 01:12:26 +0200 Subject: [PATCH] chore: remove unused columns The columns "mascotImageUrl" and "errorImageUrl" are unused in the web client. It is unlikely that they are being used elsewhere. --- .../1654124623992-remove-unused-image-urls.js | 14 ++++++++++++++ packages/backend/src/models/entities/meta.ts | 14 -------------- .../backend/src/server/api/endpoints/admin/meta.ts | 12 ------------ .../src/server/api/endpoints/admin/update-meta.ts | 10 ---------- packages/backend/src/server/api/endpoints/meta.ts | 12 ------------ 5 files changed, 14 insertions(+), 48 deletions(-) create mode 100644 packages/backend/migration/1654124623992-remove-unused-image-urls.js diff --git a/packages/backend/migration/1654124623992-remove-unused-image-urls.js b/packages/backend/migration/1654124623992-remove-unused-image-urls.js new file mode 100644 index 000000000..14ba51e3f --- /dev/null +++ b/packages/backend/migration/1654124623992-remove-unused-image-urls.js @@ -0,0 +1,14 @@ +export class removeUnusedImageUrls1654124623992 { + name = 'removeUnusedImageUrls1654124623992' + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "mascotImageUrl"`); + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "errorImageUrl"`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" ADD "mascotImageUrl" character varying(512) DEFAULT '/assets/ai.png'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "errorImageUrl" character varying(512) DEFAULT 'https://xn--931a.moe/aiart/yubitun.png'`); + } + +} diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts index 80b5228bc..0de01e507 100644 --- a/packages/backend/src/models/entities/meta.ts +++ b/packages/backend/src/models/entities/meta.ts @@ -94,13 +94,6 @@ export class Meta { }) public themeColor: string | null; - @Column('varchar', { - length: 512, - nullable: true, - default: '/assets/ai.png', - }) - public mascotImageUrl: string | null; - @Column('varchar', { length: 512, nullable: true, @@ -119,13 +112,6 @@ export class Meta { }) public logoImageUrl: string | null; - @Column('varchar', { - length: 512, - nullable: true, - default: 'https://xn--931a.moe/aiart/yubitun.png', - }) - public errorImageUrl: string | null; - @Column('varchar', { length: 512, nullable: true, diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 8d50486ef..01f3c522c 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -49,20 +49,10 @@ export const meta = { type: 'string', optional: false, nullable: true, }, - mascotImageUrl: { - type: 'string', - optional: false, nullable: false, - default: '/assets/ai.png', - }, bannerUrl: { type: 'string', optional: false, nullable: false, }, - errorImageUrl: { - type: 'string', - optional: false, nullable: false, - default: 'https://xn--931a.moe/aiart/yubitun.png', - }, iconUrl: { type: 'string', optional: false, nullable: true, @@ -342,9 +332,7 @@ export default define(meta, paramDef, async (ps, me) => { recaptchaSiteKey: instance.recaptchaSiteKey, swPublickey: instance.swPublicKey, themeColor: instance.themeColor, - mascotImageUrl: instance.mascotImageUrl, bannerUrl: instance.bannerUrl, - errorImageUrl: instance.errorImageUrl, iconUrl: instance.iconUrl, backgroundImageUrl: instance.backgroundImageUrl, logoImageUrl: instance.logoImageUrl, diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 09e43301b..eb167004d 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -28,9 +28,7 @@ export const paramDef = { type: 'string', } }, themeColor: { type: 'string', nullable: true, pattern: '^#[0-9a-fA-F]{6}$' }, - mascotImageUrl: { type: 'string', nullable: true }, bannerUrl: { type: 'string', nullable: true }, - errorImageUrl: { type: 'string', nullable: true }, iconUrl: { type: 'string', nullable: true }, backgroundImageUrl: { type: 'string', nullable: true }, logoImageUrl: { type: 'string', nullable: true }, @@ -136,10 +134,6 @@ export default define(meta, paramDef, async (ps, me) => { set.themeColor = ps.themeColor; } - if (ps.mascotImageUrl !== undefined) { - set.mascotImageUrl = ps.mascotImageUrl; - } - if (ps.bannerUrl !== undefined) { set.bannerUrl = ps.bannerUrl; } @@ -304,10 +298,6 @@ export default define(meta, paramDef, async (ps, me) => { set.smtpPass = ps.smtpPass; } - if (ps.errorImageUrl !== undefined) { - set.errorImageUrl = ps.errorImageUrl; - } - if (ps.enableServiceWorker !== undefined) { set.enableServiceWorker = ps.enableServiceWorker; } diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index 5b624842c..07db6ff1a 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -120,20 +120,10 @@ export const meta = { type: 'string', optional: false, nullable: true, }, - mascotImageUrl: { - type: 'string', - optional: false, nullable: false, - default: '/assets/ai.png', - }, bannerUrl: { type: 'string', optional: false, nullable: false, }, - errorImageUrl: { - type: 'string', - optional: false, nullable: false, - default: 'https://xn--931a.moe/aiart/yubitun.png', - }, iconUrl: { type: 'string', optional: false, nullable: true, @@ -352,9 +342,7 @@ export default define(meta, paramDef, async (ps, me) => { recaptchaSiteKey: instance.recaptchaSiteKey, swPublickey: instance.swPublicKey, themeColor: instance.themeColor, - mascotImageUrl: instance.mascotImageUrl, bannerUrl: instance.bannerUrl, - errorImageUrl: instance.errorImageUrl, iconUrl: instance.iconUrl, backgroundImageUrl: instance.backgroundImageUrl, logoImageUrl: instance.logoImageUrl,