From ebbb63161e8042da7f05e1cf61b8535bdaa54e39 Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:22:35 +0900 Subject: [PATCH 1/3] fix --- packages/frontend/src/components/MkLink.vue | 2 +- packages/frontend/src/components/MkUrlPreview.vue | 2 +- packages/frontend/src/components/global/MkUrl.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue index 24a1d213fc..2432a8e919 100644 --- a/packages/frontend/src/components/MkLink.vue +++ b/packages/frontend/src/components/MkLink.vue @@ -36,7 +36,7 @@ const props = withDefaults(defineProps<{ let self = props.url.startsWith(local); let requestUrl = new URL(props.url); if (props.host === requestUrl.host && requestUrl.pathname.startsWith('/clips/')) { - requestUrl = new URL(local + requestUrl.pathname + '@' + props.host); + requestUrl = new URL(local + requestUrl.pathname.split('@')[0] + '@' + props.host); self = true; } const url_string = requestUrl.toString(); diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue index 8edf228053..46da377554 100644 --- a/packages/frontend/src/components/MkUrlPreview.vue +++ b/packages/frontend/src/components/MkUrlPreview.vue @@ -118,7 +118,7 @@ let self = props.url.startsWith(local); let requestUrl = new URL(props.url); let url_string: string; if (props.host === requestUrl.host && requestUrl.pathname.startsWith('/clips/')) { - requestUrl = new URL(local + requestUrl.pathname + '@' + props.host); + requestUrl = new URL(local + requestUrl.pathname.split('@')[0] + '@' + props.host); self = true; url_string = requestUrl.toString(); requestUrl = new URL(props.url); diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue index 60c6bfb0ea..b24947d7fc 100644 --- a/packages/frontend/src/components/global/MkUrl.vue +++ b/packages/frontend/src/components/global/MkUrl.vue @@ -50,7 +50,7 @@ let url = new URL(props.url); if (!['http:', 'https:'].includes(url.protocol)) throw new Error('invalid url'); if (props.host === url.host && url.pathname.startsWith('/clips/')) { - url = new URL(local + url.pathname + '@' + props.host); + url = new URL(local + url.pathname.split('@')[0] + '@' + props.host); self = true; } const url_string = url.toString(); From d2a6d701391833bc027674314ca42e7570f62b82 Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:28:54 +0900 Subject: [PATCH 2/3] fix --- packages/frontend/src/components/MkLink.vue | 3 ++- packages/frontend/src/components/MkUrlPreview.vue | 3 ++- packages/frontend/src/components/global/MkUrl.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue index 2432a8e919..7f52d419fe 100644 --- a/packages/frontend/src/components/MkLink.vue +++ b/packages/frontend/src/components/MkLink.vue @@ -36,7 +36,8 @@ const props = withDefaults(defineProps<{ let self = props.url.startsWith(local); let requestUrl = new URL(props.url); if (props.host === requestUrl.host && requestUrl.pathname.startsWith('/clips/')) { - requestUrl = new URL(local + requestUrl.pathname.split('@')[0] + '@' + props.host); + let split = requestUrl.pathname.split('@'); + requestUrl = new URL(local + split[0] + '@' + (split.length >= 2 ? split[1] : props.host)); self = true; } const url_string = requestUrl.toString(); diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue index 46da377554..2d02fe1645 100644 --- a/packages/frontend/src/components/MkUrlPreview.vue +++ b/packages/frontend/src/components/MkUrlPreview.vue @@ -118,7 +118,8 @@ let self = props.url.startsWith(local); let requestUrl = new URL(props.url); let url_string: string; if (props.host === requestUrl.host && requestUrl.pathname.startsWith('/clips/')) { - requestUrl = new URL(local + requestUrl.pathname.split('@')[0] + '@' + props.host); + let split = requestUrl.pathname.split('@'); + requestUrl = new URL(local + split[0] + '@' + (split.length >= 2 ? split[1] : props.host)); self = true; url_string = requestUrl.toString(); requestUrl = new URL(props.url); diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue index b24947d7fc..50578aa714 100644 --- a/packages/frontend/src/components/global/MkUrl.vue +++ b/packages/frontend/src/components/global/MkUrl.vue @@ -50,7 +50,8 @@ let url = new URL(props.url); if (!['http:', 'https:'].includes(url.protocol)) throw new Error('invalid url'); if (props.host === url.host && url.pathname.startsWith('/clips/')) { - url = new URL(local + url.pathname.split('@')[0] + '@' + props.host); + let split = url.pathname.split('@'); + url = new URL(local + split[0] + '@' + (split.length >= 2 ? split[1] : props.host)); self = true; } const url_string = url.toString(); From d7d0644c39e776b0ef0b7c7b8923725a9f446d0f Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:34:47 +0900 Subject: [PATCH 3/3] Update CHANGELOG_YOJO.md --- CHANGELOG_YOJO.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md index f81b2a589e..72c2e6f198 100644 --- a/CHANGELOG_YOJO.md +++ b/CHANGELOG_YOJO.md @@ -11,6 +11,7 @@ Cherrypick 4.11.1 - Fix: リアクションが閲覧できる状態でも見れない問題を修正 [#429](https://github.com/yojo-art/cherrypick/pull/429) - Enhance: チャートの連合グラフで割合を表示 - Enhance: お気に入り登録クリップの一覧画面から登録解除できるように +- Fix: リモートから添付されてきたクリップURLにホスト情報があると二重になる不具合を修正 [#460](https://github.com/yojo-art/cherrypick/pull/460) ### Server -