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/MkUrlPreview.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/MkUrlPreview.vue')
| -rw-r--r-- | packages/frontend/src/components/MkUrlPreview.vue | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue index 6cd57bcc33..21de04b844 100644 --- a/packages/frontend/src/components/MkUrlPreview.vue +++ b/packages/frontend/src/components/MkUrlPreview.vue @@ -45,8 +45,8 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <div v-else-if="theNote" :class="[$style.link, { [$style.compact]: compact }]"><DynamicNoteSimple :note="theNote" :class="$style.body"/></div> <div v-else-if="!hidePreview"> - <component :is="self ? 'MkA' : 'a'" :class="[$style.link, { [$style.compact]: compact }]" :[attr]="self ? url.substring(local.length) : url" rel="nofollow noopener" :target="target" :title="url" @click.prevent="self ? true : warningExternalWebsite(url)" @click.stop> - <div v-if="thumbnail && !sensitive" :class="$style.thumbnail" :style="prefer.s.dataSaver.urlPreview ? '' : `background-image: url('${thumbnail}')`"> + <component :is="self ? 'MkA' : 'a'" :class="[$style.link, { [$style.compact]: compact }]" :[attr]="maybeRelativeUrl" rel="nofollow noopener" :target="target" :title="url" @click.prevent="self ? true : warningExternalWebsite(url)" @click.stop> + <div v-if="thumbnail && !sensitive" :class="$style.thumbnail" :style="prefer.s.dataSaver.urlPreview ? '' : { backgroundImage: `url('${thumbnail}')` }"> </div> <article :class="$style.body"> <header :class="$style.header"> @@ -104,6 +104,7 @@ import { prefer } from '@/preferences.js'; import { misskeyApi } from '@/utility/misskey-api.js'; import { warningExternalWebsite } from '@/utility/warning-external-website.js'; import DynamicNoteSimple from '@/components/DynamicNoteSimple.vue'; +import { maybeMakeRelative } from '@@/js/url.js'; type SummalyResult = Awaited<ReturnType<typeof summaly>>; @@ -126,7 +127,8 @@ const MOBILE_THRESHOLD = 500; const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD); const hidePreview = ref<boolean>(false); -const self = props.url.startsWith(local); +const maybeRelativeUrl = maybeMakeRelative(props.url, local); +const self = maybeRelativeUrl !== props.url; const attr = self ? 'to' : 'href'; const target = self ? null : '_blank'; const fetching = ref(true); |