From 2b510dc2daac846463344c46bd055f332aaadf5d Mon Sep 17 00:00:00 2001 From: Marie Date: Sun, 6 Apr 2025 00:16:36 +0200 Subject: [PATCH 1/5] upd: add `deleteThisAccountConfirm` --- locales/index.d.ts | 4 ++++ packages/frontend/src/components/SkApprovalUser.vue | 2 +- packages/frontend/src/pages/admin-user.vue | 2 +- sharkey-locales/en-US.yml | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 25bb43de22..c4e2033ddc 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -11585,6 +11585,10 @@ export interface Locale extends ILocale { * Cat friend :3 */ "oneko": string; + /** + * This will irreversibly delete this account. Proceed? + */ + "deleteThisAccountConfirm": string; /** * Enable Achievements */ diff --git a/packages/frontend/src/components/SkApprovalUser.vue b/packages/frontend/src/components/SkApprovalUser.vue index 1ef0ac5b17..5094d3f1a3 100644 --- a/packages/frontend/src/components/SkApprovalUser.vue +++ b/packages/frontend/src/components/SkApprovalUser.vue @@ -65,7 +65,7 @@ const emits = defineEmits<{ async function deleteAccount() { const confirm = await os.confirm({ type: 'warning', - text: i18n.ts.deleteAccountConfirm, + text: i18n.ts.deleteThisAccountConfirm, }); if (confirm.canceled) return; diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index ce1fbc46a1..b9746bff20 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -447,7 +447,7 @@ async function deleteAllFiles() { async function deleteAccount() { const confirm = await os.confirm({ type: 'warning', - text: i18n.ts.deleteAccountConfirm, + text: i18n.ts.deleteThisAccountConfirm, }); if (confirm.canceled) return; diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 4e426e863a..3dddb1a45c 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -138,6 +138,7 @@ oneko: "Cat friend :3" renotesList: "Boosts" lookupConfirm: "Are you sure that you want to look this up?" openTagPageConfirm: "Are you sure you want to open this hashtags page?" +deleteThisAccountConfirm: "This will irreversibly delete this account. Proceed?" specifyHost: "Specify a host" goToMisskey: "To Sharkey" enableAchievements: "Enable Achievements" From 3f1a2c6cc52d8494912c3bfa5014cfcd750948a7 Mon Sep 17 00:00:00 2001 From: dakkar Date: Sun, 6 Apr 2025 16:24:49 +0100 Subject: [PATCH 2/5] display announcement text as mfm block the `announcements.vue` page already does that --- packages/frontend/src/pages/announcement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/pages/announcement.vue b/packages/frontend/src/pages/announcement.vue index 56c10fb292..baa2c1804f 100644 --- a/packages/frontend/src/pages/announcement.vue +++ b/packages/frontend/src/pages/announcement.vue @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
{{ i18n.ts.createdAt }}: From e2507b9e0aa8764959dd0c6a56b877cb472306e8 Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 11 Apr 2025 08:17:49 +0000 Subject: [PATCH 3/5] Update 2 files - /packages/frontend/src/scripts/chiptune2.ts - /packages/frontend/src/components/SkModPlayer.vue --- packages/frontend/src/components/SkModPlayer.vue | 2 +- packages/frontend/src/scripts/chiptune2.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/SkModPlayer.vue b/packages/frontend/src/components/SkModPlayer.vue index 0933806109..4817259470 100644 --- a/packages/frontend/src/components/SkModPlayer.vue +++ b/packages/frontend/src/components/SkModPlayer.vue @@ -1,5 +1,5 @@ diff --git a/packages/frontend/src/scripts/chiptune2.ts b/packages/frontend/src/scripts/chiptune2.ts index 220002ff1e..07822502eb 100644 --- a/packages/frontend/src/scripts/chiptune2.ts +++ b/packages/frontend/src/scripts/chiptune2.ts @@ -1,6 +1,6 @@ /* - * SPDX-FileCopyrightText: marie and other Sharkey contributors - * SPDX-License-Identifier: AGPL-3.0-only + * SPDX-FileCopyrightText: Simon Gündling and other chiptune2.js contributors + * SPDX-License-Identifier: MIT */ /* eslint-disable */ From ce26d8d3cba8dd7f745feebcea747edc10c68c66 Mon Sep 17 00:00:00 2001 From: Zlendy Date: Fri, 11 Apr 2025 18:13:38 +0200 Subject: [PATCH 4/5] feat: Allow injection of raw HTML strings inside --- packages/backend/src/config.ts | 12 ++++++++++++ .../backend/src/server/web/ClientServerService.ts | 1 + packages/backend/src/server/web/views/base.pug | 2 ++ 3 files changed, 15 insertions(+) diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index 067672fd79..9bbd50cac5 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -138,6 +138,10 @@ type Source = { }; websocketCompression?: boolean; + + customHtml?: { + head?: string; + } }; export type Config = { @@ -257,6 +261,10 @@ export type Config = { }; websocketCompression?: boolean; + + customHtml: { + head: string; + } }; export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch' | 'sqlTsvector'; @@ -406,6 +414,9 @@ export function loadConfig(): Config { maxAge: config.activityLogging?.maxAge ?? (1000 * 60 * 60 * 24 * 30), }, websocketCompression: config.websocketCompression ?? false, + customHtml: { + head: config.customHtml?.head ?? '', + }, }; } @@ -558,4 +569,5 @@ function applyEnvOverrides(config: Source) { _apply_top([['signToActivityPubGet', 'checkActivityPubGetSignature', 'setupPassword']]); _apply_top(['logging', 'sql', ['disableQueryTruncation', 'enableQueryParamLogging']]); _apply_top(['activityLogging', ['enabled', 'preSave', 'maxAge']]); + _apply_top(['customHtml', ['head']]); } diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 3ed811e737..437a6802b8 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -521,6 +521,7 @@ export class ClientServerService { url: this.config.url, title: this.meta.name ?? 'Sharkey', desc: this.meta.description, + customHead: this.config.customHtml.head, ...await this.generateCommonPugData(this.meta), ...data, }); diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index f57dbbbf4e..f7b0377b22 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -45,6 +45,8 @@ html link(rel='stylesheet' href=`/static-assets/fonts/sharkey-icons/style.css?version=${version}`) link(rel='modulepreload' href=`/vite/${entry.file}`) + | !{customHead} + if !config.frontendManifestExists script(type="module" src="/vite/@vite/client") From cf260762f4f418b660f9b88f299a8cfc1a08b609 Mon Sep 17 00:00:00 2001 From: Zlendy Date: Fri, 11 Apr 2025 22:04:18 +0200 Subject: [PATCH 5/5] docs: Add usage example of "customHtml.head" to ".config/example.yml" --- .config/example.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.config/example.yml b/.config/example.yml index f3caa0d676..08a5680c41 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -425,3 +425,11 @@ attachLdSignatureForRelays: true # If you're not using jemalloc, this may cause memory fragmentation and performance issues! (https://www.npmjs.com/package/ws#websocket-compression) # jemalloc is used by default in the Sharkey Docker image and may be set up manually otherwise: https://github.com/jemalloc/jemalloc/wiki/getting-started websocketCompression: false + +# Inject arbitrary HTML tags to customize Sharkey without having to fork it +#customHtml: +# head: | +# +# +# +#