diff options
| author | dakkar <dakkar@thenautilus.net> | 2025-04-28 15:00:00 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2025-04-28 15:31:28 +0100 |
| commit | 4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241 (patch) | |
| tree | 5b00e9f161a2db8f688de1a0dfd3f86fd988592e /packages/frontend/src/components/global/MkUrl.vue | |
| parent | fix null checks for background in UserEntityService.ts (diff) | |
| parent | merge: Merge stable into develop (!971) (diff) | |
| download | sharkey-4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241.tar.gz sharkey-4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241.tar.bz2 sharkey-4981e5ba36bf9286a7bb9ff1dc6a10d7e3855241.zip | |
Merge branch 'develop' into merge/2025-03-24
Diffstat (limited to 'packages/frontend/src/components/global/MkUrl.vue')
| -rw-r--r-- | packages/frontend/src/components/global/MkUrl.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue index b2d83df0f8..058f03aeac 100644 --- a/packages/frontend/src/components/global/MkUrl.vue +++ b/packages/frontend/src/components/global/MkUrl.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <component - :is="self ? 'MkA' : 'a'" ref="el" :class="$style.root" class="_link" :[attr]="self ? props.url.substring(local.length) : props.url" :rel="rel ?? 'nofollow noopener'" :target="target" + :is="self ? 'MkA' : 'a'" ref="el" :class="$style.root" class="_link" :[attr]="maybeRelativeUrl" :rel="rel ?? 'nofollow noopener'" :target="target" :behavior="props.navigationBehavior" @contextmenu.stop="() => {}" @click.prevent="self ? true : warningExternalWebsite(props.url)" @@ -35,6 +35,7 @@ import { useTooltip } from '@/use/use-tooltip.js'; import { isEnabledUrlPreview } from '@/instance.js'; import type { MkABehavior } from '@/components/global/MkA.vue'; import { warningExternalWebsite } from '@/utility/warning-external-website.js'; +import { maybeMakeRelative } from '@@/js/url.js'; function safeURIDecode(str: string): string { try { @@ -53,7 +54,8 @@ const props = withDefaults(defineProps<{ showUrlPreview: true, }); -const self = props.url.startsWith(local); +const maybeRelativeUrl = maybeMakeRelative(props.url, local); +const self = maybeRelativeUrl !== props.url; const url = new URL(props.url); if (!['http:', 'https:'].includes(url.protocol)) throw new Error('invalid url'); const el = ref(); |