From 9217d9bff5eeaa6af76a8b97dd2fe3b9c2b870b0 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 21 Sep 2022 13:18:12 -0700 Subject: [PATCH] fix --- locales/en-US.yml | 2 +- locales/ja-JP.yml | 2 +- package.json | 2 +- .../src/server/api/endpoints/admin/update-meta.ts | 6 +++--- packages/client/src/pages/admin/settings.vue | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 92d658b2ec..cff2297f53 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -915,7 +915,7 @@ caption: "Auto Caption" splash: "Splash Screen" updateAvailable: "There might be an update available!" swipeOnDesktop: "Allow mobile-style swiping on desktop" -logoUrl: "Logo URL" +logoImageUrl: "Logo URL" _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f4a9c3c44f..593b1d9358 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -915,7 +915,7 @@ caption: "自動キャプション" splash: "スプラッシュスクリーン" updateAvailable: "アップデートがありますよ" swipeOnDesktop: "デスクトップでモバイルスタイルのスワイプを可能にする" -logoUrl: "ロゴのURL" +logoImageUrl: "ロゴのURL" _sensitiveMediaDetection: description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。" diff --git a/package.json b/package.json index 2b04854317..d3c7901891 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.1-rc.9", + "version": "12.119.0-calc.1-rc.9.1", "codename": "aqua", "repository": { "type": "git", 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 3e061a9e0c..1774e8bc1f 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -45,7 +45,7 @@ export const paramDef = { themeColor: { type: 'string', nullable: true, pattern: '^#[0-9a-fA-F]{6}$' }, mascotImageUrl: { type: 'string', nullable: true }, bannerUrl: { type: 'string', nullable: true }, - logoUrl: { type: 'string', nullable: true }, + logoImageUrl: { type: 'string', nullable: true }, errorImageUrl: { type: 'string', nullable: true }, iconUrl: { type: 'string', nullable: true }, backgroundImageUrl: { type: 'string', nullable: true }, @@ -194,8 +194,8 @@ export default define(meta, paramDef, async (ps, me) => { set.bannerUrl = ps.bannerUrl; } - if (ps.logoUrl !== undefined) { - set.logoUrl = ps.logoUrl; + if (ps.logoImageUrl !== undefined) { + set.logoImageUrl = ps.logoImageUrl; } if (ps.iconUrl !== undefined) { diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue index 206858087c..e565be32fe 100644 --- a/packages/client/src/pages/admin/settings.vue +++ b/packages/client/src/pages/admin/settings.vue @@ -71,9 +71,9 @@ - + - + @@ -196,7 +196,7 @@ let maintainerName: string | null = $ref(null); let maintainerEmail: string | null = $ref(null); let iconUrl: string | null = $ref(null); let bannerUrl: string | null = $ref(null); -let logoUrl: string | null = $ref(null); +let logoImageUrl: string | null = $ref(null); let backgroundImageUrl: string | null = $ref(null); let themeColor: any = $ref(null); let defaultLightTheme: any = $ref(null); @@ -226,7 +226,7 @@ async function init() { tosUrl = meta.tosUrl; iconUrl = meta.iconUrl; bannerUrl = meta.bannerUrl; - logoUrl = meta.logoUrl; + logoImageUrl = meta.logoImageUrl; backgroundImageUrl = meta.backgroundImageUrl; themeColor = meta.themeColor; defaultLightTheme = meta.defaultLightTheme; @@ -259,7 +259,7 @@ function save() { tosUrl, iconUrl, bannerUrl, - logoUrl, + logoImageUrl, backgroundImageUrl, themeColor: themeColor === '' ? null : themeColor, defaultLightTheme: defaultLightTheme === '' ? null : defaultLightTheme,