From 587ab8500abb2d8b0a494dc05952c9919cc7f66f Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Mon, 2 Mar 2026 16:05:12 -0500 Subject: split url into webUrl and localUrl (like mastodon) --- packages/frontend/src/components/MkAccountMoved.vue | 2 +- packages/frontend/src/components/MkDonation.vue | 14 ++++++++++++-- packages/frontend/src/components/MkEmbedCodeGenDialog.vue | 4 ++-- packages/frontend/src/components/MkFollowButton.vue | 4 ++-- packages/frontend/src/components/MkLink.vue | 4 ++-- packages/frontend/src/components/MkMention.vue | 2 +- packages/frontend/src/components/MkNote.vue | 4 ++-- packages/frontend/src/components/MkNoteDetailed.vue | 4 ++-- packages/frontend/src/components/MkPageWindow.vue | 6 +++--- packages/frontend/src/components/MkPoll.vue | 4 ++-- packages/frontend/src/components/MkPostForm.vue | 10 +++++----- packages/frontend/src/components/MkPreview.vue | 2 +- packages/frontend/src/components/MkSignin.input.vue | 2 +- packages/frontend/src/components/MkSignupDialog.form.vue | 2 +- .../frontend/src/components/MkSourceCodeAvailablePopup.vue | 6 +++--- packages/frontend/src/components/MkTutorialDialog.vue | 4 ++-- packages/frontend/src/components/MkUrlPreview.vue | 4 ++-- packages/frontend/src/components/MkUserSelectDialog.vue | 4 ++-- packages/frontend/src/components/MkUserSetupDialog.vue | 6 +++--- packages/frontend/src/components/global/MkA.vue | 4 ++-- packages/frontend/src/components/global/MkAcct.vue | 4 ++-- packages/frontend/src/components/global/MkAd.vue | 4 ++-- packages/frontend/src/components/global/MkMfm.ts | 4 ++-- packages/frontend/src/components/global/MkUrl.vue | 4 ++-- 24 files changed, 59 insertions(+), 49 deletions(-) (limited to 'packages/frontend/src/components') diff --git a/packages/frontend/src/components/MkAccountMoved.vue b/packages/frontend/src/components/MkAccountMoved.vue index cb8032c019..e101c04793 100644 --- a/packages/frontend/src/components/MkAccountMoved.vue +++ b/packages/frontend/src/components/MkAccountMoved.vue @@ -16,7 +16,7 @@ import { ref } from 'vue'; import * as Misskey from 'misskey-js'; import MkMention from './MkMention.vue'; import { i18n } from '@/i18n.js'; -import { host as localHost } from '@@/js/config.js'; +import { localHost } from '@@/js/config.js'; import { misskeyApi } from '@/utility/misskey-api.js'; const user = ref(); diff --git a/packages/frontend/src/components/MkDonation.vue b/packages/frontend/src/components/MkDonation.vue index 0e0da64750..b7ee704b47 100644 --- a/packages/frontend/src/components/MkDonation.vue +++ b/packages/frontend/src/components/MkDonation.vue @@ -19,13 +19,23 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.learnMore }}
+
+ + + +
+ {{ i18n.ts.learnMore }} +
+
{{ i18n.ts.remindMeLater }} {{ i18n.ts.neverShow }} @@ -38,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue index c592079f03..14a1c71e10 100644 --- a/packages/frontend/src/components/global/MkAd.vue +++ b/packages/frontend/src/components/global/MkAd.vue @@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
Ads by {{ host }}
+
Ads by {{ webHost }}
{{ i18n.ts._ad.reduceFrequencyOfThisAd }} @@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only