From b4bd9508ee0fd63f10aa54a844ae74d3112f8c88 Mon Sep 17 00:00:00 2001 From: cuteBoiButt Date: Thu, 5 Sep 2024 17:29:03 +0000 Subject: Use proper logging facilities in WebfingerService --- packages/backend/src/core/WebfingerService.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages/backend/src') diff --git a/packages/backend/src/core/WebfingerService.ts b/packages/backend/src/core/WebfingerService.ts index 1517dd0074..86079a115b 100644 --- a/packages/backend/src/core/WebfingerService.ts +++ b/packages/backend/src/core/WebfingerService.ts @@ -8,6 +8,8 @@ import { Injectable } from '@nestjs/common'; import { XMLParser } from 'fast-xml-parser'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { bindThis } from '@/decorators.js'; +import Logger from '@/logger.js'; +import { RemoteLoggerService } from './RemoteLoggerService.js'; export type ILink = { href: string; @@ -28,9 +30,13 @@ const defaultProtocol = process.env.MISSKEY_WEBFINGER_USE_HTTP?.toLowerCase() == @Injectable() export class WebfingerService { + private logger: Logger; + constructor( private httpRequestService: HttpRequestService, + private remoteLoggerService: RemoteLoggerService, ) { + this.logger = this.remoteLoggerService.logger.createSubLogger('webfinger'); } @bindThis @@ -103,7 +109,7 @@ export class WebfingerService { const template = (hostMeta['XRD']['Link'] as Array).filter(p => p['@_rel'] === 'lrdd')[0]['@_template']; return template.indexOf('{uri}') < 0 ? null : template; } catch (err) { - console.error(`error while request host-meta for ${url}: ${err}`); + this.logger.error(`error while request host-meta for ${url}: ${err}`); return null; } } -- cgit v1.2.3-freya From e8cdec227892fe89a5d60ec82582528087657e8c Mon Sep 17 00:00:00 2001 From: cuteBoiButt Date: Fri, 6 Sep 2024 11:45:00 +0000 Subject: We don't need the whole Logger class here --- packages/backend/src/core/WebfingerService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/backend/src') diff --git a/packages/backend/src/core/WebfingerService.ts b/packages/backend/src/core/WebfingerService.ts index 86079a115b..f57e7a2c1f 100644 --- a/packages/backend/src/core/WebfingerService.ts +++ b/packages/backend/src/core/WebfingerService.ts @@ -8,7 +8,7 @@ import { Injectable } from '@nestjs/common'; import { XMLParser } from 'fast-xml-parser'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { bindThis } from '@/decorators.js'; -import Logger from '@/logger.js'; +import type Logger from '@/logger.js'; import { RemoteLoggerService } from './RemoteLoggerService.js'; export type ILink = { -- cgit v1.2.3-freya From 1af6f8c5da88d1fcc4ca8785f2c002c1e5e43d24 Mon Sep 17 00:00:00 2001 From: piuvas Date: Sun, 22 Sep 2024 13:27:41 -0300 Subject: backend configuring --- packages/backend/src/core/entities/InstanceEntityService.ts | 1 + packages/backend/src/core/entities/MetaEntityService.ts | 1 + packages/backend/src/models/Instance.ts | 5 +++++ packages/backend/src/models/Meta.ts | 6 ++++++ packages/backend/src/server/api/endpoints/admin/meta.ts | 5 +++++ .../backend/src/server/api/endpoints/admin/update-meta.ts | 5 +++++ packages/frontend/src/pages/admin/branding.vue | 11 +++++++++++ packages/misskey-js/src/autogen/types.ts | 2 ++ 8 files changed, 36 insertions(+) (limited to 'packages/backend/src') diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts index 7695e6dfa7..87fe8723f8 100644 --- a/packages/backend/src/core/entities/InstanceEntityService.ts +++ b/packages/backend/src/core/entities/InstanceEntityService.ts @@ -52,6 +52,7 @@ export class InstanceEntityService { isSilenced: this.utilityService.isSilencedHost(meta.silencedHosts, instance.host), isMediaSilenced: this.utilityService.isMediaSilencedHost(meta.mediaSilencedHosts, instance.host), iconUrl: instance.iconUrl, + sidebarLogoUrl: instance.sidebarLogoUrl, faviconUrl: instance.faviconUrl, themeColor: instance.themeColor, infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null, diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts index 3128b762f4..afeefc9033 100644 --- a/packages/backend/src/core/entities/MetaEntityService.ts +++ b/packages/backend/src/core/entities/MetaEntityService.ts @@ -105,6 +105,7 @@ export class MetaEntityService { serverErrorImageUrl: instance.serverErrorImageUrl, notFoundImageUrl: instance.notFoundImageUrl, iconUrl: instance.iconUrl, + sidebarLogoUrl: instance.sidebarLogoUrl, backgroundImageUrl: instance.backgroundImageUrl, logoImageUrl: instance.logoImageUrl, maxNoteTextLength: this.config.maxNoteLength, diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts index dd625f95d3..820002c91c 100644 --- a/packages/backend/src/models/Instance.ts +++ b/packages/backend/src/models/Instance.ts @@ -139,6 +139,11 @@ export class MiInstance { }) public iconUrl: string | null; + @Column('varchar', { + length: 256, nullable: true, + }) + public sidebarLogoUrl: string | null; + @Column('varchar', { length: 256, nullable: true, }) diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts index 07c4e28b3a..a84b6fcc5b 100644 --- a/packages/backend/src/models/Meta.ts +++ b/packages/backend/src/models/Meta.ts @@ -127,6 +127,12 @@ export class MiMeta { }) public iconUrl: string | null; + @Column('varchar', { + length: 1024, + nullable: true, + }) + public sidebarLogoUrl: string | null; + @Column('varchar', { length: 1024, 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 063bb6751b..ed90d3fdde 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -102,6 +102,10 @@ export const meta = { type: 'string', optional: false, nullable: true, }, + sidebarLogoUrl: { + type: 'string', + optional: false, nullable: true, + }, app192IconUrl: { type: 'string', optional: false, nullable: true, @@ -580,6 +584,7 @@ export default class extends Endpoint { // eslint- notFoundImageUrl: instance.notFoundImageUrl, infoImageUrl: instance.infoImageUrl, iconUrl: instance.iconUrl, + sidebarLogoUrl: instance.sidebarLogoUrl, app192IconUrl: instance.app192IconUrl, app512IconUrl: instance.app512IconUrl, backgroundImageUrl: instance.backgroundImageUrl, 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 6bda1ae6ad..b8b2416b14 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -53,6 +53,7 @@ export const paramDef = { infoImageUrl: { type: 'string', nullable: true }, notFoundImageUrl: { type: 'string', nullable: true }, iconUrl: { type: 'string', nullable: true }, + sidebarLogoUrl: { type: 'string', nullable: true }, app192IconUrl: { type: 'string', nullable: true }, app512IconUrl: { type: 'string', nullable: true }, backgroundImageUrl: { type: 'string', nullable: true }, @@ -242,6 +243,10 @@ export default class extends Endpoint { // eslint- set.iconUrl = ps.iconUrl; } + if (ps.sidebarLogoUrl !== undefined) { + set.sidebarLogoUrl = ps.sidebarLogoUrl; + } + if (ps.app192IconUrl !== undefined) { set.app192IconUrl = ps.app192IconUrl; } diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue index 2e14aef0b9..57abbe4432 100644 --- a/packages/frontend/src/pages/admin/branding.vue +++ b/packages/frontend/src/pages/admin/branding.vue @@ -14,6 +14,14 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + + @@ -128,6 +136,7 @@ import MkColorInput from '@/components/MkColorInput.vue'; import { host } from '@/config.js'; const iconUrl = ref(null); +const sidebarLogoUrl = ref(null); const app192IconUrl = ref(null); const app512IconUrl = ref(null); const bannerUrl = ref(null); @@ -146,6 +155,7 @@ const manifestJsonOverride = ref('{}'); async function init() { const meta = await misskeyApi('admin/meta'); iconUrl.value = meta.iconUrl; + sidebarLogoUrl.value = meta.sidebarLogoUrl; app192IconUrl.value = meta.app192IconUrl; app512IconUrl.value = meta.app512IconUrl; bannerUrl.value = meta.bannerUrl; @@ -165,6 +175,7 @@ async function init() { function save() { os.apiWithDialog('admin/update-meta', { iconUrl: iconUrl.value, + sidebarLogoUrl: sidebarLogoUrl.value, app192IconUrl: app192IconUrl.value, app512IconUrl: app512IconUrl.value, bannerUrl: bannerUrl.value, diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index 562c498190..10354043fc 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -5191,6 +5191,7 @@ export type operations = { infoImageUrl: string | null; notFoundImageUrl: string | null; iconUrl: string | null; + sidebarLogoUrl: string | null; app192IconUrl: string | null; app512IconUrl: string | null; enableEmail: boolean; @@ -9704,6 +9705,7 @@ export type operations = { infoImageUrl?: string | null; notFoundImageUrl?: string | null; iconUrl?: string | null; + sidebarLogoUrl?: string | null; app192IconUrl?: string | null; app512IconUrl?: string | null; backgroundImageUrl?: string | null; -- cgit v1.2.3-freya From 4ee29733031fc99a3cee85c855d785872e53ee3f Mon Sep 17 00:00:00 2001 From: piuvas Date: Sun, 22 Sep 2024 17:32:20 -0300 Subject: requested fixes! --- locales/en-US.yml | 3 ++- locales/index.d.ts | 12 ++++++++++++ locales/ja-JP.yml | 3 +++ .../backend/migration/1727027985575-SidebarLogo.js | 16 ++++++++++++++++ .../backend/migration/1727027985575i-SidebarLogo.js | 18 ------------------ packages/backend/src/models/Instance.ts | 5 ----- .../frontend/src/components/MkVisitorDashboard.vue | 3 +-- packages/frontend/src/pages/admin/branding.vue | 2 +- .../frontend/src/ui/_common_/navbar-for-mobile.vue | 3 +-- packages/frontend/src/ui/_common_/navbar.vue | 3 +-- 10 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 packages/backend/migration/1727027985575-SidebarLogo.js delete mode 100644 packages/backend/migration/1727027985575i-SidebarLogo.js (limited to 'packages/backend/src') diff --git a/locales/en-US.yml b/locales/en-US.yml index 3a233f33f9..d6303d3982 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1451,9 +1451,10 @@ _serverRules: description: "A set of rules to be displayed before registration. Setting a summary of the Terms of Service is recommended." _serverSettings: iconUrl: "Icon URL" - appIconDescription: "Specifies the icon to use when {host} is displayed as an app." sidebarLogoDescription: "Specifies the logo to use instead of the regular icon in high definition, dynamic-width scenarios." sidebarLogoUsageExample: "E.g. In the sidebar, to visitors and in the \"About\" page." + sidebarLogoHint: "Sidebar/Logo" + appIconDescription: "Specifies the icon to use when {host} is displayed as an app." appIconUsageExample: "E.g. As PWA, or when displayed as a home screen bookmark on a phone" appIconStyleRecommendation: "As the icon may be cropped to a square or circle, an icon with colored margin around the content is recommended." appIconResolutionMustBe: "The minimum resolution is {resolution}." diff --git a/locales/index.d.ts b/locales/index.d.ts index 177a3c8160..0e59255860 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5776,6 +5776,18 @@ export interface Locale extends ILocale { * アイコン画像のURL */ "iconUrl": string; + /** + * 高精細、ダイナミック幅のシナリオで通常のアイコンの代わりに使用するロゴを指定します。 + */ + "sidebarLogoDescription": string; + /** + * 例：サイドバー、訪問者用、「About 」ページ + */ + "sidebarLogoUsageExample": string; + /** + * サイドバー/ロゴ + */ + "sidebarLogoHint": string; /** * {host}がアプリとして表示される際のアイコンを指定します。 */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b4d47a449c..ddddbd7910 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1459,6 +1459,9 @@ _serverRules: _serverSettings: iconUrl: "アイコン画像のURL" + sidebarLogoDescription: "高精細、ダイナミック幅のシナリオで通常のアイコンの代わりに使用するロゴを指定します。" + sidebarLogoUsageExample: "例：サイドバー、訪問者用、「About 」ページ" + sidebarLogoHint: "サイドバー/ロゴ" appIconDescription: "{host}がアプリとして表示される際のアイコンを指定します。" appIconUsageExample: "例: PWAや、スマートフォンのホーム画面にブックマークとして追加された時など" appIconStyleRecommendation: "円形もしくは角丸にクロップされる場合があるため、塗り潰された余白のある背景を持つことが推奨されます。" diff --git a/packages/backend/migration/1727027985575-SidebarLogo.js b/packages/backend/migration/1727027985575-SidebarLogo.js new file mode 100644 index 0000000000..03344a367f --- /dev/null +++ b/packages/backend/migration/1727027985575-SidebarLogo.js @@ -0,0 +1,16 @@ +/* + * SPDX-FileCopyrightText: piuvas and other Sharkey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +export class SidebarLogo1727027985575 { + name = 'SidebarLogo1727027985575'; + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" ADD "sidebarLogoUrl" character varying(1024)`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sidebarLogoUrl"`); + } +} diff --git a/packages/backend/migration/1727027985575i-SidebarLogo.js b/packages/backend/migration/1727027985575i-SidebarLogo.js deleted file mode 100644 index a9a066ed6c..0000000000 --- a/packages/backend/migration/1727027985575i-SidebarLogo.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - * SPDX-FileCopyrightText: piuvas and other Sharkey contributors - * SPDX-License-Identifier: AGPL-3.0-only - */ - -export class SidebarLogo1727027985575 { - name = 'SidebarLogo1727027985575'; - - async up(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" ADD "sidebarLogoUrl" character varying(1024)`); - await queryRunner.query(`ALTER TABLE "instance" ADD "sidebarLogoUrl" character varying(1024)`); - } - - async down(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sidebarLogoUrl"`); - await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "sidebarLogoUrl"`); - } -} diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts index 820002c91c..dd625f95d3 100644 --- a/packages/backend/src/models/Instance.ts +++ b/packages/backend/src/models/Instance.ts @@ -139,11 +139,6 @@ export class MiInstance { }) public iconUrl: string | null; - @Column('varchar', { - length: 256, nullable: true, - }) - public sidebarLogoUrl: string | null; - @Column('varchar', { length: 256, nullable: true, }) diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index 73d00b6a7c..b154f7a5b3 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only