From 58a98da0fcda2d93c416df177815804784c05c10 Mon Sep 17 00:00:00 2001
From: Camilla Ett <camilla.ett@gmail.com>
Date: Mon, 11 Mar 2024 18:33:50 +0900
Subject: [PATCH 01/22] =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AB?=
 =?UTF-8?q?=E5=90=AB=E3=81=BE=E3=82=8C=E3=81=9FURL=E3=81=8C=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E3=82=B5=E3=82=A4=E3=83=88=E3=81=AE=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=80=81=E8=AD=A6=E5=91=8A=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=81=8B?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                            |  8 ++++++++
 locales/ja-JP.yml                             |  2 ++
 packages/frontend/src/components/MkLink.vue   | 20 +++++++++++++++++--
 .../frontend/src/components/global/MkUrl.vue  | 19 ++++++++++++++++--
 .../frontend/src/pages/settings/general.vue   |  2 ++
 packages/frontend/src/store.ts                |  4 ++++
 6 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 53c3159da6..0099a115ef 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2960,6 +2960,10 @@ export interface Locale extends ILocale {
      * 添付画像のサムネイルをオリジナル画質にする
      */
     "loadRawImages": string;
+    /**
+     * ノートに含まれたURLを開くとき、外部サイトの場合は警告を出す
+     */
+    "checkRedirectingOtherHost": string;
     /**
      * アニメーション画像を再生しない
      */
@@ -4804,6 +4808,10 @@ export interface Locale extends ILocale {
      * 「内容を隠す」がオンの場合は注釈の記述が必要です。
      */
     "cwNotationRequired": string;
+    /**
+     * 外部サイトへリダイレクトしようとしています。
+     */
+    "warningRedirectingOtherHost": string;
     /**
      * リアクションする
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 64705868b9..fdeca2846d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -736,6 +736,7 @@ noCrawleDescription: "外部の検索エンジンにあなたのユーザーペ
 lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
+checkRedirectingOtherHost: "ノートに含まれたURLを開くとき、外部サイトの場合は警告を出す"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
@@ -1197,6 +1198,7 @@ disableStreamingTimeline: "タイムラインのリアルタイム更新を無
 useGroupedNotifications: "通知をグルーピングして表示する"
 signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
+warningRedirectingOtherHost: "外部サイトへリダイレクトしようとしています。"
 doReaction: "リアクションする"
 code: "コード"
 reloadRequiredToApplySettings: "設定の反映にはリロードが必要です。"
diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue
index a5abbeceac..2dfd046945 100644
--- a/packages/frontend/src/components/MkLink.vue
+++ b/packages/frontend/src/components/MkLink.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <component
 	:is="self ? 'MkA' : 'a'" ref="el" style="word-break: break-all;" class="_link" :[attr]="self ? url.substring(local.length) : url" :rel="rel ?? 'nofollow noopener'" :target="target"
-	:title="url"
+	:title="url" @click.prevent.stop="alertOtherHost"
 >
 	<slot></slot>
 	<i v-if="target === '_blank'" class="ti ti-external-link" :class="$style.icon"></i>
@@ -18,6 +18,8 @@ import { defineAsyncComponent, ref } from 'vue';
 import { url as local } from '@/config.js';
 import { useTooltip } from '@/scripts/use-tooltip.js';
 import * as os from '@/os.js';
+import { defaultStore } from '@/store.js';
+import { i18n } from '@/i18n.js';
 
 const props = withDefaults(defineProps<{
 	url: string;
@@ -27,7 +29,7 @@ const props = withDefaults(defineProps<{
 
 const self = props.url.startsWith(local);
 const attr = self ? 'to' : 'href';
-const target = self ? null : '_blank';
+const target = self ? undefined : '_blank';
 
 const el = ref<HTMLElement>();
 
@@ -38,6 +40,20 @@ useTooltip(el, (showing) => {
 		source: el.value,
 	}, {}, 'closed');
 });
+
+async function alertOtherHost() {
+	if(defaultStore.state.checkRedirectingOtherHost && !self) {
+		// show confirm dialog when redirecting other host
+		const confirm = await os.confirm({
+			type: 'warning',
+			title: i18n.ts.warningRedirectingOtherHost,
+			text: props.url,
+		});
+		if (confirm.canceled) return;
+		return;
+	}
+	window.open(props.url, target, props.rel ?? 'nofollow noopener');
+}
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue
index 0c3eee63ff..0ed3ca59b1 100644
--- a/packages/frontend/src/components/global/MkUrl.vue
+++ b/packages/frontend/src/components/global/MkUrl.vue
@@ -6,7 +6,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"
-	@contextmenu.stop="() => {}"
+	@contextmenu.stop="() => {}" @click.prevent.stop="alertOtherHost"
 >
 	<template v-if="!self">
 		<span :class="$style.schema">{{ schema }}//</span>
@@ -30,6 +30,8 @@ import { url as local } from '@/config.js';
 import * as os from '@/os.js';
 import { useTooltip } from '@/scripts/use-tooltip.js';
 import { safeURIDecode } from '@/scripts/safe-uri-decode.js';
+import { defaultStore } from '@/store.js';
+import { i18n } from '@/i18n.js';
 
 const props = withDefaults(defineProps<{
 	url: string;
@@ -61,7 +63,20 @@ const pathname = safeURIDecode(url.pathname);
 const query = safeURIDecode(url.search);
 const hash = safeURIDecode(url.hash);
 const attr = self ? 'to' : 'href';
-const target = self ? null : '_blank';
+const target = self ? undefined : '_blank';
+
+async function alertOtherHost() {
+	if(defaultStore.state.checkRedirectingOtherHost && !self) {
+		// show confirm dialog when redirecting other host
+		const confirm = await os.confirm({
+			type: 'warning',
+			title: i18n.ts.warningRedirectingOtherHost,
+			text: props.url,
+		});
+		if (confirm.canceled) return;
+	}
+	window.open(props.url, target, props.rel ?? 'nofollow noopener');
+}
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 285f874dde..0adc2530d4 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -59,6 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="showReactionsCount">{{ i18n.ts.showReactionsCount }}</MkSwitch>
 				<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
 				<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
+				<MkSwitch v-model="checkRedirectingOtherHost">{{ i18n.ts.checkRedirectingOtherHost }}</MkSwitch>
 				<MkRadios v-model="reactionsDisplaySize">
 					<template #label>{{ i18n.ts.reactionsDisplaySize }}</template>
 					<option value="small">{{ i18n.ts.small }}</option>
@@ -289,6 +290,7 @@ const disableDrawer = computed(defaultStore.makeGetterSetter('disableDrawer'));
 const disableShowingAnimatedImages = computed(defaultStore.makeGetterSetter('disableShowingAnimatedImages'));
 const forceShowAds = computed(defaultStore.makeGetterSetter('forceShowAds'));
 const loadRawImages = computed(defaultStore.makeGetterSetter('loadRawImages'));
+const checkRedirectingOtherHost = computed(defaultStore.makeGetterSetter('checkRedirectingOtherHost'));
 const highlightSensitiveMedia = computed(defaultStore.makeGetterSetter('highlightSensitiveMedia'));
 const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
 const nsfw = computed(defaultStore.makeGetterSetter('nsfw'));
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index a335ed33bb..a4ceff37e7 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -239,6 +239,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
+	checkRedirectingOtherHost: {
+		where: 'device',
+		default: true,
+	},
 	imageNewTab: {
 		where: 'device',
 		default: false,

From 0341328701993c98e86cf870eac14a0998d68cf6 Mon Sep 17 00:00:00 2001
From: Camilla Ett <camilla.ett@gmail.com>
Date: Mon, 11 Mar 2024 22:44:12 +0900
Subject: [PATCH 02/22] =?UTF-8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=81=AE=E6=8C=99=E5=8B=95=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                                | 2 +-
 locales/ja-JP.yml                                 | 2 +-
 packages/frontend/src/components/MkLink.vue       | 6 ++----
 packages/frontend/src/components/global/MkUrl.vue | 5 ++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 0099a115ef..eea3c292c2 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4811,7 +4811,7 @@ export interface Locale extends ILocale {
     /**
      * 外部サイトへリダイレクトしようとしています。
      */
-    "warningRedirectingOtherHost": string;
+    "warningRedirectingOtherHost": ParameterizedString<"url">;
     /**
      * リアクションする
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fdeca2846d..3e301ad36a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1198,7 +1198,7 @@ disableStreamingTimeline: "タイムラインのリアルタイム更新を無
 useGroupedNotifications: "通知をグルーピングして表示する"
 signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
-warningRedirectingOtherHost: "外部サイトへリダイレクトしようとしています。"
+warningRedirectingOtherHost: "外部サイトへリダイレクトしようとしています。\nURLが問題ないか確認してアクセスしてください\n{url}"
 doReaction: "リアクションする"
 code: "コード"
 reloadRequiredToApplySettings: "設定の反映にはリロードが必要です。"
diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue
index 2dfd046945..8112c6bc88 100644
--- a/packages/frontend/src/components/MkLink.vue
+++ b/packages/frontend/src/components/MkLink.vue
@@ -46,13 +46,11 @@ async function alertOtherHost() {
 		// show confirm dialog when redirecting other host
 		const confirm = await os.confirm({
 			type: 'warning',
-			title: i18n.ts.warningRedirectingOtherHost,
-			text: props.url,
+			text: i18n.tsx.warningRedirectingOtherHost({ url: props.url }),
 		});
 		if (confirm.canceled) return;
-		return;
 	}
-	window.open(props.url, target, props.rel ?? 'nofollow noopener');
+	window.open(props.url, "_blank", 'nofollow noopener');
 }
 </script>
 
diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue
index 0ed3ca59b1..5e98840475 100644
--- a/packages/frontend/src/components/global/MkUrl.vue
+++ b/packages/frontend/src/components/global/MkUrl.vue
@@ -70,12 +70,11 @@ async function alertOtherHost() {
 		// show confirm dialog when redirecting other host
 		const confirm = await os.confirm({
 			type: 'warning',
-			title: i18n.ts.warningRedirectingOtherHost,
-			text: props.url,
+			text: i18n.tsx.warningRedirectingOtherHost({ url: props.url }),
 		});
 		if (confirm.canceled) return;
 	}
-	window.open(props.url, target, props.rel ?? 'nofollow noopener');
+	window.open(props.url, "_blank", 'nofollow noopener');
 }
 </script>
 

From bf37e95e575cc88ce2e03d8f6882b8907cddb619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 22 Mar 2024 07:43:59 +0900
Subject: [PATCH 03/22] =?UTF-8?q?enhance(frontend):=20=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=88=E3=81=B8=E3=81=AE=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=AF=E3=81=AF=E7=A7=BB=E5=8B=95=E3=81=AE=E5=89=8D=E3=81=AB?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20(MisskeyIO#558)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 01ec286f3f479d030bd4a59ab666b513b1175bca)
---
 locales/index.d.ts                                    |  8 ++++++++
 locales/ja-JP.yml                                     |  2 ++
 .../migration/1711008460816-external-website-warn.js  | 11 +++++++++++
 .../backend/src/core/entities/MetaEntityService.ts    |  1 +
 packages/backend/src/models/Meta.ts                   |  5 +++++
 packages/backend/src/models/json-schema/meta.ts       |  8 ++++++++
 .../backend/src/server/api/endpoints/admin/meta.ts    |  9 +++++++++
 .../src/server/api/endpoints/admin/update-meta.ts     | 10 ++++++++++
 packages/frontend/src/pages/admin/moderation.vue      |  8 ++++++++
 packages/misskey-js/src/autogen/types.ts              |  3 +++
 10 files changed, 65 insertions(+)
 create mode 100644 packages/backend/migration/1711008460816-external-website-warn.js

diff --git a/locales/index.d.ts b/locales/index.d.ts
index e1250946f3..981c0f15aa 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4812,6 +4812,14 @@ export interface Locale extends ILocale {
      * リアクションする
      */
     "doReaction": string;
+    /**
+     * よく知られたウェブサイト
+     */
+    "wellKnownWebsites": string;
+    /**
+     * スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。
+     */
+    "wellKnownWebsitesDescription": string;
     /**
      * コード
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 1c4df27d92..db877de7e8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1199,6 +1199,8 @@ useGroupedNotifications: "通知をグルーピングして表示する"
 signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
 doReaction: "リアクションする"
+wellKnownWebsites: "よく知られたウェブサイト"
+wellKnownWebsitesDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。"
 code: "コード"
 reloadRequiredToApplySettings: "設定の反映にはリロードが必要です。"
 remainingN: "残り: {n}"
diff --git a/packages/backend/migration/1711008460816-external-website-warn.js b/packages/backend/migration/1711008460816-external-website-warn.js
new file mode 100644
index 0000000000..6e6ae75ef6
--- /dev/null
+++ b/packages/backend/migration/1711008460816-external-website-warn.js
@@ -0,0 +1,11 @@
+export class ExternalWebsiteWarn1711008460816 {
+    name = 'ExternalWebsiteWarn1711008460816'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "wellKnownWebsites" character varying(3072) array NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "wellKnownWebsites"`);
+    }
+}
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 9d054ab6a1..259d70c31b 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -100,6 +100,7 @@ export class MetaEntityService {
 				imageUrl: ad.imageUrl,
 				dayOfWeek: ad.dayOfWeek,
 			})),
+			wellKnownWebsites: instance.wellKnownWebsites,
 			notesPerOneAd: instance.notesPerOneAd,
 			enableEmail: instance.enableEmail,
 			enableServiceWorker: instance.enableServiceWorker,
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index 04a34bbbb4..8e37f48243 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -603,6 +603,11 @@ export class MiMeta {
 	})
 	public urlPreviewRequireContentLength: boolean;
 
+	@Column('varchar', {
+		length: 3072, array: true, default: '{}',
+	})
+	public wellKnownWebsites: string[];
+
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
index 473339a1ad..bbc53004c9 100644
--- a/packages/backend/src/models/json-schema/meta.ts
+++ b/packages/backend/src/models/json-schema/meta.ts
@@ -186,6 +186,14 @@ export const packedMetaLiteSchema = {
 				},
 			},
 		},
+		wellKnownWebsites: {
+			type: 'array',
+			optional: false, nullable: false,
+			items: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+		},
 		notesPerOneAd: {
 			type: 'number',
 			optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index f4ff573271..cc367c9525 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -371,6 +371,14 @@ export const meta = {
 				type: 'number',
 				optional: false, nullable: false,
 			},
+			wellKnownWebsites: {
+				type: 'array',
+				optional: false, nullable: false,
+				items: {
+					type: 'string',
+					optional: false, nullable: false,
+				},
+			},
 			backgroundImageUrl: {
 				type: 'string',
 				optional: false, nullable: true,
@@ -601,6 +609,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				perRemoteUserUserTimelineCacheMax: instance.perRemoteUserUserTimelineCacheMax,
 				perUserHomeTimelineCacheMax: instance.perUserHomeTimelineCacheMax,
 				perUserListTimelineCacheMax: instance.perUserListTimelineCacheMax,
+				wellKnownWebsites: instance.wellKnownWebsites,
 				notesPerOneAd: instance.notesPerOneAd,
 				summalyProxy: instance.urlPreviewSummaryProxyUrl,
 				urlPreviewEnabled: instance.urlPreviewEnabled,
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index 2f62d30ada..5804759040 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -153,6 +153,11 @@ export const paramDef = {
 			type: 'string', nullable: true,
 			description: '[Deprecated] Use "urlPreviewSummaryProxyUrl" instead.',
 		},
+		wellKnownWebsites: {
+			type: 'array', nullable: true, items: {
+				type: 'string',
+			},
+		},
 		urlPreviewEnabled: { type: 'boolean' },
 		urlPreviewTimeout: { type: 'integer' },
 		urlPreviewMaximumContentLength: { type: 'integer' },
@@ -202,6 +207,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					return h !== '' && h !== lv && !set.blockedHosts?.includes(h);
 				});
 			}
+			
+			if (Array.isArray(ps.wellKnownWebsites)) {
+				set.wellKnownWebsites = ps.wellKnownWebsites.filter(Boolean);
+			}
+
 			if (ps.themeColor !== undefined) {
 				set.themeColor = ps.themeColor;
 			}
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 9efb34ac9a..5217360856 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -45,6 +45,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #caption>{{ i18n.ts.prohibitedWordsDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
 					</MkTextarea>
 
+					<MkTextarea v-model="wellKnownWebsites">
+						<template #label>{{ i18n.ts.wellKnownWebsites }}</template>
+						<template #caption>{{ i18n.ts.wellKnownWebsitesDescription }}</template>
+					</MkTextarea>
+
 					<MkTextarea v-model="hiddenTags">
 						<template #label>{{ i18n.ts.hiddenTags }}</template>
 						<template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
@@ -86,6 +91,7 @@ const hiddenTags = ref<string>('');
 const preservedUsernames = ref<string>('');
 const tosUrl = ref<string | null>(null);
 const privacyPolicyUrl = ref<string | null>(null);
+const wellKnownWebsites = ref<string>('');
 
 async function init() {
 	const meta = await misskeyApi('admin/meta');
@@ -97,6 +103,7 @@ async function init() {
 	preservedUsernames.value = meta.preservedUsernames.join('\n');
 	tosUrl.value = meta.tosUrl;
 	privacyPolicyUrl.value = meta.privacyPolicyUrl;
+	wellKnownWebsites.value = meta.wellKnownWebsites.join('\n');
 }
 
 function save() {
@@ -109,6 +116,7 @@ function save() {
 		prohibitedWords: prohibitedWords.value.split('\n'),
 		hiddenTags: hiddenTags.value.split('\n'),
 		preservedUsernames: preservedUsernames.value.split('\n'),
+		wellKnownWebsites: wellKnownWebsites.value.split('\n'),
 	}).then(() => {
 		fetchInstance(true);
 	});
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index c6e36d80aa..3c3d052b2a 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4804,6 +4804,7 @@ export type components = {
           imageUrl: string;
           dayOfWeek: number;
         }[];
+      wellKnownWebsites: string[];
       /** @default 0 */
       notesPerOneAd: number;
       enableEmail: boolean;
@@ -4948,6 +4949,7 @@ export type operations = {
             perUserHomeTimelineCacheMax: number;
             perUserListTimelineCacheMax: number;
             notesPerOneAd: number;
+            wellKnownWebsites: string[];
             backgroundImageUrl: string | null;
             deeplAuthKey: string | null;
             deeplIsPro: boolean;
@@ -8928,6 +8930,7 @@ export type operations = {
           silencedHosts?: string[] | null;
           /** @description [Deprecated] Use "urlPreviewSummaryProxyUrl" instead. */
           summalyProxy?: string | null;
+          wellKnownWebsites?: string[] | null;
           urlPreviewEnabled?: boolean;
           urlPreviewTimeout?: number;
           urlPreviewMaximumContentLength?: number;

From e6e119c9da442f845274bde21483b0995ff4ffb7 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:03:16 +0900
Subject: [PATCH 04/22] add dedicated dialog

---
 locales/index.d.ts                            |  15 ++
 locales/ja-JP.yml                             |   5 +
 .../src/components/MkUrlWarningDialog.vue     | 136 ++++++++++++++++++
 packages/frontend/src/store.ts                |   4 +
 4 files changed, 160 insertions(+)
 create mode 100644 packages/frontend/src/components/MkUrlWarningDialog.vue

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 981c0f15aa..071629296e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9842,6 +9842,21 @@ export interface Locale extends ILocale {
          */
         "summaryProxyDescription2": string;
     };
+    "_urlWarning": {
+        /**
+         * 外部サイトに移動します
+         */
+        "title": string;
+        /**
+         * 別のサイトに移動しようとしています。
+         * リンク先の安全性を十分に確認した上で進んでください。
+         */
+        "description": string;
+        /**
+         * 今後{domain}のリンクを信頼する
+         */
+        "trustThisDomain": ParameterizedString<"domain">;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index db877de7e8..e024d22b06 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2621,3 +2621,8 @@ _urlPreviewSetting:
   summaryProxy: "プレビューを生成するプロキシのエンドポイント"
   summaryProxyDescription: "Misskey本体ではなく、サマリープロキシを使用してプレビューを生成します。"
   summaryProxyDescription2: "プロキシには下記パラメータがクエリ文字列として連携されます。プロキシ側がこれらをサポートしない場合、設定値は無視されます。"
+
+_urlWarning:
+  title: "外部サイトに移動します"
+  description: "別のサイトに移動しようとしています。\nリンク先の安全性を十分に確認した上で進んでください。"
+  trustThisDomain: "今後{domain}のリンクを信頼する"
diff --git a/packages/frontend/src/components/MkUrlWarningDialog.vue b/packages/frontend/src/components/MkUrlWarningDialog.vue
new file mode 100644
index 0000000000..de0df86e72
--- /dev/null
+++ b/packages/frontend/src/components/MkUrlWarningDialog.vue
@@ -0,0 +1,136 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkModal ref="modal" :preferType="'dialog'" :zPriority="'high'" @click="done(true)" @closed="emit('closed')">
+	<div :class="$style.root" class="_gaps">
+		<div class="_gaps_s">
+			<div :class="$style.icon">
+				<i :class="$style.iconInner" class="ti ti-alert-triangle"></i>
+			</div>
+			<header :class="$style.title">{{ i18n.ts._urlWarning.title }}</header>
+			<div><Mfm :text="i18n.ts._urlWarning.description"/></div>
+			<div class="_monospace" :class="$style.urlAddress">{{ url }}</div>
+			<div>
+				<MkSwitch v-model="trustThisDomain">{{ i18n.tsx._urlWarning.trustThisDomain({ domain }) }}</MkSwitch>
+			</div>
+		</div>
+		<div :class="$style.buttons">
+			<MkButton data-cy-modal-dialog-ok inline primary rounded @click="ok">{{ i18n.ts.ok }}</MkButton>
+			<MkButton data-cy-modal-dialog-cancel inline rounded @click="cancel">{{ i18n.ts.cancel }}</MkButton>
+		</div>
+	</div>
+</MkModal>
+</template>
+
+<script lang="ts" setup>
+import { onBeforeUnmount, onMounted, ref, shallowRef, computed } from 'vue';
+import MkModal from '@/components/MkModal.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
+import { i18n } from '@/i18n.js';
+import { defaultStore } from '@/store.js';
+
+type Result = string | number | true | null;
+
+const props = withDefaults(defineProps<{
+	url: string;
+	openInNewTab?: boolean;
+}>(), {
+	openInNewTab: true,
+});
+
+const emit = defineEmits<{
+	(ev: 'done', v: { canceled: true } | { canceled: false, result: Result }): void;
+	(ev: 'closed'): void;
+}>();
+
+const modal = shallowRef<InstanceType<typeof MkModal>>();
+const trustThisDomain = ref(false);
+
+const domain = computed(() => new URL(props.url).hostname);
+
+// overload function を使いたいので lint エラーを無視する
+function done(canceled: true): void;
+function done(canceled: false, result: Result): void; // eslint-disable-line no-redeclare
+function done(canceled: boolean, result?: Result): void { // eslint-disable-line no-redeclare
+	emit('done', { canceled, result } as { canceled: true } | { canceled: false, result: Result });
+	modal.value?.close();
+}
+
+async function ok() {
+	const result = true;
+	if (!defaultStore.state.trustedDomains.includes(domain.value) && trustThisDomain.value) {
+		await defaultStore.set('trustedDomains', defaultStore.state.trustedDomains.concat(domain.value));
+	}
+	done(false, result);
+}
+
+function cancel() {
+	done(true);
+}
+
+/*
+function onBgClick() {
+	if (props.cancelableByBgClick) cancel();
+}
+*/
+function onKeydown(evt: KeyboardEvent) {
+	if (evt.key === 'Escape') cancel();
+}
+
+onMounted(() => {
+	document.addEventListener('keydown', onKeydown);
+});
+
+onBeforeUnmount(() => {
+	document.removeEventListener('keydown', onKeydown);
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	position: relative;
+	margin: auto;
+	padding: 32px;
+	width: 100%;
+	min-width: 320px;
+	max-width: 480px;
+	box-sizing: border-box;
+	text-align: center;
+	background: var(--panel);
+	border-radius: 16px;
+}
+
+.icon {
+	font-size: 24px;
+	color: var(--warn);
+}
+
+.iconInner {
+	display: block;
+	margin: 0 auto;
+}
+
+.title {
+	font-weight: bold;
+	font-size: 1.1em;
+}
+
+.urlAddress {
+	padding: 8px;
+	border-radius: calc(var(--radius) / 2);
+	border: 1px solid var(--divider);
+	overflow-x: auto;
+	white-space: nowrap;
+}
+
+.buttons {
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+	justify-content: center;
+}
+</style>
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 7742acc60d..c2ee298b7b 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -132,6 +132,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: [] as string[],
 	},
+	trustedDomains: {
+		where: 'account',
+		default: [] as string[],
+	},
 
 	menu: {
 		where: 'deviceAccount',

From 4590046e25638a7f23e97a239ce8b934419dfa0f Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:12:31 +0900
Subject: [PATCH 05/22] spdx

---
 .../backend/migration/1711008460816-external-website-warn.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/backend/migration/1711008460816-external-website-warn.js b/packages/backend/migration/1711008460816-external-website-warn.js
index 6e6ae75ef6..f6af6de38a 100644
--- a/packages/backend/migration/1711008460816-external-website-warn.js
+++ b/packages/backend/migration/1711008460816-external-website-warn.js
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 export class ExternalWebsiteWarn1711008460816 {
     name = 'ExternalWebsiteWarn1711008460816'
 

From 05138daca45d3f36d1e9df04e76a03b1a577e795 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:25:43 +0900
Subject: [PATCH 06/22] Use dedicated dialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
---
 locales/index.d.ts                            |  8 ----
 locales/ja-JP.yml                             |  2 -
 packages/frontend/src/components/MkLink.vue   | 21 +++-------
 .../src/components/MkUrlWarningDialog.vue     |  7 +---
 .../frontend/src/components/global/MkUrl.vue  | 21 +++-------
 .../src/scripts/warning-external-website.ts   | 42 +++++++++++++++++++
 6 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 packages/frontend/src/scripts/warning-external-website.ts

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 6c38812efb..071629296e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2964,10 +2964,6 @@ export interface Locale extends ILocale {
      * 添付画像のサムネイルをオリジナル画質にする
      */
     "loadRawImages": string;
-    /**
-     * ノートに含まれたURLを開くとき、外部サイトの場合は警告を出す
-     */
-    "checkRedirectingOtherHost": string;
     /**
      * アニメーション画像を再生しない
      */
@@ -4812,10 +4808,6 @@ export interface Locale extends ILocale {
      * 「内容を隠す」がオンの場合は注釈の記述が必要です。
      */
     "cwNotationRequired": string;
-    /**
-     * 外部サイトへリダイレクトしようとしています。
-     */
-    "warningRedirectingOtherHost": ParameterizedString<"url">;
     /**
      * リアクションする
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8ea4b6c8ee..e024d22b06 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -737,7 +737,6 @@ noCrawleDescription: "外部の検索エンジンにあなたのユーザーペ
 lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
-checkRedirectingOtherHost: "ノートに含まれたURLを開くとき、外部サイトの場合は警告を出す"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
@@ -1199,7 +1198,6 @@ disableStreamingTimeline: "タイムラインのリアルタイム更新を無
 useGroupedNotifications: "通知をグルーピングして表示する"
 signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
-warningRedirectingOtherHost: "外部サイトへリダイレクトしようとしています。\nURLが問題ないか確認してアクセスしてください\n{url}"
 doReaction: "リアクションする"
 wellKnownWebsites: "よく知られたウェブサイト"
 wellKnownWebsitesDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。"
diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue
index 390aadc6c6..e05fc9128c 100644
--- a/packages/frontend/src/components/MkLink.vue
+++ b/packages/frontend/src/components/MkLink.vue
@@ -5,8 +5,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <component
-	:is="self ? 'MkA' : 'a'" ref="el" style="word-break: break-all;" class="_link" :[attr]="self ? url.substring(local.length) : url" :rel="rel ?? 'nofollow noopener'" :target="target"
-	:title="url" @click.prevent.stop="alertOtherHost"
+	:is="self ? 'MkA' : 'a'" ref="el" style="word-break: break-all;" class="_link" :[attr]="self ? url.substring(local.length) : url" :rel="rel" :target="target"
+	:title="url" @click="(ev: MouseEvent) => warningExternalWebsite(ev, props.url)"
 >
 	<slot></slot>
 	<i v-if="target === '_blank'" class="ti ti-external-link" :class="$style.icon"></i>
@@ -18,34 +18,23 @@ import { defineAsyncComponent, ref } from 'vue';
 import { url as local } from '@/config.js';
 import { useTooltip } from '@/scripts/use-tooltip.js';
 import * as os from '@/os.js';
-import { defaultStore } from '@/store.js';
-import { i18n } from '@/i18n.js';
 import { isEnabledUrlPreview } from '@/instance.js';
+import { warningExternalWebsite } from '@/scripts/warning-external-website.js';
 
 const props = withDefaults(defineProps<{
 	url: string;
 	rel?: null | string;
 }>(), {
+	rel: 'nofollow noopener',
 });
 
+// eslint-disable-next-line vue/no-setup-props-destructure
 const self = props.url.startsWith(local);
 const attr = self ? 'to' : 'href';
 const target = self ? undefined : '_blank';
 
 const el = ref<HTMLElement | { $el: HTMLElement }>();
 
-async function alertOtherHost() {
-	if(defaultStore.state.checkRedirectingOtherHost && !self) {
-		// show confirm dialog when redirecting other host
-		const confirm = await os.confirm({
-			type: 'warning',
-			text: i18n.tsx.warningRedirectingOtherHost({ url: props.url }),
-		});
-		if (confirm.canceled) return;
-	}
-	window.open(props.url, "_blank", 'nofollow noopener');
-}
-
 if (isEnabledUrlPreview.value) {
 	useTooltip(el, (showing) => {
 		os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
diff --git a/packages/frontend/src/components/MkUrlWarningDialog.vue b/packages/frontend/src/components/MkUrlWarningDialog.vue
index de0df86e72..ca149f85b9 100644
--- a/packages/frontend/src/components/MkUrlWarningDialog.vue
+++ b/packages/frontend/src/components/MkUrlWarningDialog.vue
@@ -35,12 +35,9 @@ import { defaultStore } from '@/store.js';
 
 type Result = string | number | true | null;
 
-const props = withDefaults(defineProps<{
+const props = defineProps<{
 	url: string;
-	openInNewTab?: boolean;
-}>(), {
-	openInNewTab: true,
-});
+}>();
 
 const emit = defineEmits<{
 	(ev: 'done', v: { canceled: true } | { canceled: false, result: Result }): void;
diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue
index 68a1658d6e..fc7c66551a 100644
--- a/packages/frontend/src/components/global/MkUrl.vue
+++ b/packages/frontend/src/components/global/MkUrl.vue
@@ -5,8 +5,8 @@ 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"
-	@contextmenu.stop="() => {}" @click.prevent.stop="alertOtherHost"
+	:is="self ? 'MkA' : 'a'" ref="el" :class="$style.root" class="_link" :[attr]="self ? props.url.substring(local.length) : props.url" :rel="rel" :target="target"
+	@contextmenu.stop="() => {}" @click="(ev: MouseEvent) => warningExternalWebsite(ev, props.url)"
 >
 	<template v-if="!self">
 		<span :class="$style.schema">{{ schema }}//</span>
@@ -30,18 +30,19 @@ import { url as local } from '@/config.js';
 import * as os from '@/os.js';
 import { useTooltip } from '@/scripts/use-tooltip.js';
 import { safeURIDecode } from '@/scripts/safe-uri-decode.js';
-import { defaultStore } from '@/store.js';
-import { i18n } from '@/i18n.js';
 import { isEnabledUrlPreview } from '@/instance.js';
+import { warningExternalWebsite } from '@/scripts/warning-external-website.js';
 
 const props = withDefaults(defineProps<{
 	url: string;
 	rel?: string;
 	showUrlPreview?: boolean;
 }>(), {
+	rel: 'nofollow noopener',
 	showUrlPreview: true,
 });
 
+// eslint-disable-next-line vue/no-setup-props-destructure
 const self = props.url.startsWith(local);
 const url = new URL(props.url);
 if (!['http:', 'https:'].includes(url.protocol)) throw new Error('invalid url');
@@ -65,18 +66,6 @@ const query = safeURIDecode(url.search);
 const hash = safeURIDecode(url.hash);
 const attr = self ? 'to' : 'href';
 const target = self ? undefined : '_blank';
-
-async function alertOtherHost() {
-	if(defaultStore.state.checkRedirectingOtherHost && !self) {
-		// show confirm dialog when redirecting other host
-		const confirm = await os.confirm({
-			type: 'warning',
-			text: i18n.tsx.warningRedirectingOtherHost({ url: props.url }),
-		});
-		if (confirm.canceled) return;
-	}
-	window.open(props.url, "_blank", 'nofollow noopener');
-}
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/scripts/warning-external-website.ts b/packages/frontend/src/scripts/warning-external-website.ts
new file mode 100644
index 0000000000..76a8d6321e
--- /dev/null
+++ b/packages/frontend/src/scripts/warning-external-website.ts
@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { url as local } from '@/config.js';
+import { instance } from '@/instance.js';
+import * as os from '@/os.js';
+import MkUrlWarningDialog from '@/components/MkUrlWarningDialog.vue';
+
+const isRegExp = /^\/(.+)\/(.*)$/;
+
+export async function warningExternalWebsite(ev: MouseEvent, url: string) {
+	const self = url.startsWith(local);
+	const isWellKnownWebsite = self || instance.wellKnownWebsites.some(expression => {
+		const r = isRegExp.exec(expression);
+		if (r) {
+			return new RegExp(r[1], r[2]).test(url);
+		} else return expression.split(' ').every(keyword => url.includes(keyword));
+	});
+
+	if (!self && !isWellKnownWebsite) {
+		ev.preventDefault();
+		ev.stopPropagation();
+
+		const confirm = await new Promise<{ canceled: boolean }>(resolve => {
+			os.popup(MkUrlWarningDialog, {
+				url,
+			}, {
+				done: result => {
+					resolve(result ? result : { canceled: true });
+				},
+			}, 'closed');
+		});
+
+		if (confirm.canceled) return false;
+
+		window.open(url, '_blank', 'noopener');
+	}
+
+	return true;
+}

From 4ca7214e952affea8777ceb2638f5f398758a372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 22 Mar 2024 08:52:46 +0900
Subject: [PATCH 07/22] =?UTF-8?q?fix(MkUrlPreview):=20=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=88=E3=81=B8=E3=81=AE=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=AF=E3=81=AF=E7=A7=BB=E5=8B=95=E3=81=AE=E5=89=8D=E3=81=AB?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f7ec503b9ceb34d61a0dbd658858915eb7399c5d)
---
 packages/frontend/src/components/MkUrlPreview.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index 6954f1f6ff..263fae0176 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -44,8 +44,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</div>
 </template>
 <div v-else>
-	<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">
-		<div v-if="thumbnail && !sensitive" :class="$style.thumbnail" :style="defaultStore.state.dataSaver.urlPreview ? '' : `background-image: url('${thumbnail}')`">
+	<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="(ev: MouseEvent) => warningExternalWebsite(ev, url)"
+	>
+		<div v-if="thumbnail" :class="[$style.thumbnail, { [$style.thumbnailBlur]: sensitive }]" :style="defaultStore.state.dataSaver.urlPreview ? '' : `background-image: url('${thumbnail}')`">
 		</div>
 		<article :class="$style.body">
 			<header :class="$style.header">
@@ -92,6 +100,7 @@ import { deviceKind } from '@/scripts/device-kind.js';
 import MkButton from '@/components/MkButton.vue';
 import { versatileLang } from '@/scripts/intl-const.js';
 import { defaultStore } from '@/store.js';
+import { warningExternalWebsite } from '@/scripts/warning-external-website.js';
 
 type SummalyResult = Awaited<ReturnType<typeof summaly>>;
 

From 708934156a6127002865980cda6cbb311d64559d Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:57:11 +0900
Subject: [PATCH 08/22] fix

---
 packages/frontend/src/components/MkUrlWarningDialog.vue   | 2 +-
 packages/frontend/src/scripts/warning-external-website.ts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkUrlWarningDialog.vue b/packages/frontend/src/components/MkUrlWarningDialog.vue
index ca149f85b9..da5e4b401a 100644
--- a/packages/frontend/src/components/MkUrlWarningDialog.vue
+++ b/packages/frontend/src/components/MkUrlWarningDialog.vue
@@ -117,7 +117,7 @@ onBeforeUnmount(() => {
 }
 
 .urlAddress {
-	padding: 8px;
+	padding: var(--margin);
 	border-radius: calc(var(--radius) / 2);
 	border: 1px solid var(--divider);
 	overflow-x: auto;
diff --git a/packages/frontend/src/scripts/warning-external-website.ts b/packages/frontend/src/scripts/warning-external-website.ts
index 76a8d6321e..08bb2b16e6 100644
--- a/packages/frontend/src/scripts/warning-external-website.ts
+++ b/packages/frontend/src/scripts/warning-external-website.ts
@@ -5,12 +5,15 @@
 
 import { url as local } from '@/config.js';
 import { instance } from '@/instance.js';
+import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import MkUrlWarningDialog from '@/components/MkUrlWarningDialog.vue';
 
 const isRegExp = /^\/(.+)\/(.*)$/;
 
 export async function warningExternalWebsite(ev: MouseEvent, url: string) {
+	const _url = new URL(url);
+
 	const self = url.startsWith(local);
 	const isWellKnownWebsite = self || instance.wellKnownWebsites.some(expression => {
 		const r = isRegExp.exec(expression);
@@ -18,8 +21,9 @@ export async function warningExternalWebsite(ev: MouseEvent, url: string) {
 			return new RegExp(r[1], r[2]).test(url);
 		} else return expression.split(' ').every(keyword => url.includes(keyword));
 	});
+	const isTrustedByUser = defaultStore.reactiveState.trustedDomains.value.includes(_url.hostname);
 
-	if (!self && !isWellKnownWebsite) {
+	if (!self && !isWellKnownWebsite && !isTrustedByUser) {
 		ev.preventDefault();
 		ev.stopPropagation();
 

From c8b340d8d48b279fb671719e476f4d46b84dff44 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:02:44 +0900
Subject: [PATCH 09/22] Update Changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d90b1425c1..932725e59c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 - コントロールパネル内にあるサマリープロキシの設定個所がセキュリティから全般へ変更となります。
 
 ### General
+- Feat: 外部サイトへのリンクは移動の前に警告を表示するように  
+  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/558 and https://github.com/MisskeyIO/misskey/commit/f7ec503b9ceb34d61a0dbd658858915eb7399c5d)
 - Enhance: URLプレビューの有効化・無効化を設定できるように #13569
 - Enhance: アンテナでBotによるノートを除外できるように  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/545)

From e626e25b360bd9636f35ba6742885427d9200ed9 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:09:48 +0900
Subject: [PATCH 10/22] =?UTF-8?q?trustedDomains=E3=81=AE=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=A0=B4=E6=89=80=E3=82=92=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/store.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 7f08002e98..b677ea6765 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -132,10 +132,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: [] as string[],
 	},
-	trustedDomains: {
-		where: 'account',
-		default: [] as string[],
-	},
 
 	menu: {
 		where: 'deviceAccount',
@@ -450,6 +446,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: true,
 	},
+	trustedDomains: {
+		where: 'device',
+		default: [] as string[],
+	},
 
 	sound_masterVolume: {
 		where: 'device',

From eb7d9c75a292e401525a9cc1cb880830e95dcd3c Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 19:21:43 +0900
Subject: [PATCH 11/22] Add comment

---
 packages/backend/src/models/Meta.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index 8e37f48243..abe4e12c34 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -604,7 +604,10 @@ export class MiMeta {
 	public urlPreviewRequireContentLength: boolean;
 
 	@Column('varchar', {
-		length: 3072, array: true, default: '{}',
+		length: 3072,
+		array: true,
+		default: '{}',
+		comment: 'An array of URL strings or regex that can be used to omit warnings about redirects to external sites. Separate them with spaces to specify AND, and enclose them with slashes to specify regular expressions.',
 	})
 	public wellKnownWebsites: string[];
 

From a4cc88897b4c29db23a4a1abbd6c1bcf4c10d430 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 19:22:50 +0900
Subject: [PATCH 12/22] comment

---
 packages/backend/src/models/Meta.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index abe4e12c34..df39ed1d91 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -607,7 +607,7 @@ export class MiMeta {
 		length: 3072,
 		array: true,
 		default: '{}',
-		comment: 'An array of URL strings or regex that can be used to omit warnings about redirects to external sites. Separate them with spaces to specify AND, and enclose them with slashes to specify regular expressions.',
+		comment: 'An array of URL strings or regex that can be used to omit warnings about redirects to external sites. Separate them with spaces to specify AND, and enclose them with slashes to specify regular expressions. Each item is regarded as an OR.',
 	})
 	public wellKnownWebsites: string[];
 

From e010342c0ea490f907027fdcea9d8cb1a868a08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 22 Mar 2024 19:05:05 +0900
Subject: [PATCH 13/22] =?UTF-8?q?enhance(frontend):=20=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=88=E3=81=B8=E3=81=AE=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=AF=E3=81=AF=E7=A7=BB=E5=8B=95=E3=81=AE=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E3=81=AE=E6=9D=A1=E4=BB=B6=E3=81=AE=E8=AA=BF=E6=95=B4=20(Missk?=
 =?UTF-8?q?eyIO#564)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 65978cbe61b7e86e25795948ee2ef34bdf6f846c)
---
 locales/ja-JP.yml                                     |  2 +-
 .../frontend/src/scripts/warning-external-website.ts  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e024d22b06..abb1cdea29 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1200,7 +1200,7 @@ signupPendingError: "メールアドレスの確認中に問題が発生しま
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
 doReaction: "リアクションする"
 wellKnownWebsites: "よく知られたウェブサイト"
-wellKnownWebsitesDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。"
+wellKnownWebsitesDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。ドメイン名だけ書くと後方一致になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。"
 code: "コード"
 reloadRequiredToApplySettings: "設定の反映にはリロードが必要です。"
 remainingN: "残り: {n}"
diff --git a/packages/frontend/src/scripts/warning-external-website.ts b/packages/frontend/src/scripts/warning-external-website.ts
index 08bb2b16e6..9cca2b925d 100644
--- a/packages/frontend/src/scripts/warning-external-website.ts
+++ b/packages/frontend/src/scripts/warning-external-website.ts
@@ -9,19 +9,20 @@ import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import MkUrlWarningDialog from '@/components/MkUrlWarningDialog.vue';
 
+const extractDomain = /^(https?:\/\/|\/\/)?([^@/\s]+@)?(www\.)?([^:/\s]+)/i;
 const isRegExp = /^\/(.+)\/(.*)$/;
 
 export async function warningExternalWebsite(ev: MouseEvent, url: string) {
-	const _url = new URL(url);
-
-	const self = url.startsWith(local);
+	const domain = extractDomain.exec(url)?.[4];
+	const self = !domain || url.startsWith(local);
 	const isWellKnownWebsite = self || instance.wellKnownWebsites.some(expression => {
 		const r = isRegExp.exec(expression);
 		if (r) {
 			return new RegExp(r[1], r[2]).test(url);
-		} else return expression.split(' ').every(keyword => url.includes(keyword));
+		} else if (expression.includes(' ')) return expression.split(' ').every(keyword => url.includes(keyword));
+		else return domain.endsWith(expression);
 	});
-	const isTrustedByUser = defaultStore.reactiveState.trustedDomains.value.includes(_url.hostname);
+	const isTrustedByUser = defaultStore.reactiveState.trustedDomains.value.includes(domain);
 
 	if (!self && !isWellKnownWebsite && !isTrustedByUser) {
 		ev.preventDefault();

From abf6a74a93c424b6bf2b7a48adf3ae70c6167792 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Mar 2024 23:53:10 +0900
Subject: [PATCH 14/22] use url

---
 packages/frontend/src/scripts/warning-external-website.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/frontend/src/scripts/warning-external-website.ts b/packages/frontend/src/scripts/warning-external-website.ts
index 9cca2b925d..dfc75874fd 100644
--- a/packages/frontend/src/scripts/warning-external-website.ts
+++ b/packages/frontend/src/scripts/warning-external-website.ts
@@ -9,11 +9,10 @@ import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import MkUrlWarningDialog from '@/components/MkUrlWarningDialog.vue';
 
-const extractDomain = /^(https?:\/\/|\/\/)?([^@/\s]+@)?(www\.)?([^:/\s]+)/i;
 const isRegExp = /^\/(.+)\/(.*)$/;
 
 export async function warningExternalWebsite(ev: MouseEvent, url: string) {
-	const domain = extractDomain.exec(url)?.[4];
+	const domain = new URL(url).hostname;
 	const self = !domain || url.startsWith(local);
 	const isWellKnownWebsite = self || instance.wellKnownWebsites.some(expression => {
 		const r = isRegExp.exec(expression);

From d52064489ae95c07c81fb899d04b7a2ff4ba5516 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 23 Mar 2024 00:01:02 +0900
Subject: [PATCH 15/22] fix types

---
 packages/frontend/src/instance.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/instance.ts b/packages/frontend/src/instance.ts
index 22337e7eb9..eb7d1c1c6c 100644
--- a/packages/frontend/src/instance.ts
+++ b/packages/frontend/src/instance.ts
@@ -28,7 +28,7 @@ if (providedAt > cachedAt) {
 
 // TODO: instanceをリアクティブにするかは再考の余地あり
 
-export const instance: Misskey.entities.MetaResponse = reactive(cachedMeta ?? {});
+export const instance: Misskey.entities.MetaDetailed = reactive(cachedMeta ?? {});
 
 export const serverErrorImageUrl = computed(() => instance.serverErrorImageUrl ?? DEFAULT_SERVER_ERROR_IMAGE_URL);
 
@@ -48,7 +48,7 @@ export async function fetchInstance(force = false): Promise<void> {
 	}
 
 	const meta = await misskeyApi('meta', {
-		detail: false,
+		detail: true,
 	});
 
 	for (const [k, v] of Object.entries(meta)) {

From 523fad6f012d16b690fe506045bd21189f1100b1 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 24 Mar 2024 17:15:01 +0900
Subject: [PATCH 16/22] Revert "use url"

This reverts commit abf6a74a93c424b6bf2b7a48adf3ae70c6167792.
---
 packages/frontend/src/scripts/warning-external-website.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/warning-external-website.ts b/packages/frontend/src/scripts/warning-external-website.ts
index dfc75874fd..9cca2b925d 100644
--- a/packages/frontend/src/scripts/warning-external-website.ts
+++ b/packages/frontend/src/scripts/warning-external-website.ts
@@ -9,10 +9,11 @@ import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import MkUrlWarningDialog from '@/components/MkUrlWarningDialog.vue';
 
+const extractDomain = /^(https?:\/\/|\/\/)?([^@/\s]+@)?(www\.)?([^:/\s]+)/i;
 const isRegExp = /^\/(.+)\/(.*)$/;
 
 export async function warningExternalWebsite(ev: MouseEvent, url: string) {
-	const domain = new URL(url).hostname;
+	const domain = extractDomain.exec(url)?.[4];
 	const self = !domain || url.startsWith(local);
 	const isWellKnownWebsite = self || instance.wellKnownWebsites.some(expression => {
 		const r = isRegExp.exec(expression);

From 9114c552716e646c11ab3a905798a7750f35f8fe Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 24 Mar 2024 19:39:29 +0900
Subject: [PATCH 17/22] `wellKnownWebsites` -> `trustedLinkUrlPatterns`

---
 locales/index.d.ts                                   |  4 ++--
 locales/ja-JP.yml                                    |  4 ++--
 .../migration/1711008460816-external-website-warn.js |  4 ++--
 .../backend/src/core/entities/MetaEntityService.ts   |  2 +-
 packages/backend/src/models/Meta.ts                  |  2 +-
 packages/backend/src/models/json-schema/meta.ts      |  2 +-
 .../backend/src/server/api/endpoints/admin/meta.ts   |  4 ++--
 .../src/server/api/endpoints/admin/update-meta.ts    |  6 +++---
 packages/frontend/src/pages/admin/moderation.vue     | 12 ++++++------
 .../frontend/src/scripts/warning-external-website.ts |  4 ++--
 packages/misskey-js/src/autogen/types.ts             |  6 +++---
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 071629296e..29aae74359 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4815,11 +4815,11 @@ export interface Locale extends ILocale {
     /**
      * よく知られたウェブサイト
      */
-    "wellKnownWebsites": string;
+    "trustedLinkUrlPatterns": string;
     /**
      * スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。
      */
-    "wellKnownWebsitesDescription": string;
+    "trustedLinkUrlPatternsDescription": string;
     /**
      * コード
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index abb1cdea29..1dba5722da 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1199,8 +1199,8 @@ useGroupedNotifications: "通知をグルーピングして表示する"
 signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
 doReaction: "リアクションする"
-wellKnownWebsites: "よく知られたウェブサイト"
-wellKnownWebsitesDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。ドメイン名だけ書くと後方一致になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。"
+trustedLinkUrlPatterns: "外部サイトへのリンク警告 除外リスト"
+trustedLinkUrlPatternsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。ドメイン名だけ書くと後方一致になります。"
 code: "コード"
 reloadRequiredToApplySettings: "設定の反映にはリロードが必要です。"
 remainingN: "残り: {n}"
diff --git a/packages/backend/migration/1711008460816-external-website-warn.js b/packages/backend/migration/1711008460816-external-website-warn.js
index f6af6de38a..a1c9d001bf 100644
--- a/packages/backend/migration/1711008460816-external-website-warn.js
+++ b/packages/backend/migration/1711008460816-external-website-warn.js
@@ -7,10 +7,10 @@ export class ExternalWebsiteWarn1711008460816 {
     name = 'ExternalWebsiteWarn1711008460816'
 
     async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "wellKnownWebsites" character varying(3072) array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "trustedLinkUrlPatterns" character varying(3072) array NOT NULL DEFAULT '{}'`);
     }
 
     async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "wellKnownWebsites"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "trustedLinkUrlPatterns"`);
     }
 }
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 259d70c31b..6f8a4ba77c 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -100,7 +100,7 @@ export class MetaEntityService {
 				imageUrl: ad.imageUrl,
 				dayOfWeek: ad.dayOfWeek,
 			})),
-			wellKnownWebsites: instance.wellKnownWebsites,
+			trustedLinkUrlPatterns: instance.trustedLinkUrlPatterns,
 			notesPerOneAd: instance.notesPerOneAd,
 			enableEmail: instance.enableEmail,
 			enableServiceWorker: instance.enableServiceWorker,
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index df39ed1d91..2ef6e7f6f7 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -609,7 +609,7 @@ export class MiMeta {
 		default: '{}',
 		comment: 'An array of URL strings or regex that can be used to omit warnings about redirects to external sites. Separate them with spaces to specify AND, and enclose them with slashes to specify regular expressions. Each item is regarded as an OR.',
 	})
-	public wellKnownWebsites: string[];
+	public trustedLinkUrlPatterns: string[];
 
 	@Column('varchar', {
 		length: 1024,
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
index bbc53004c9..1a3b3584d8 100644
--- a/packages/backend/src/models/json-schema/meta.ts
+++ b/packages/backend/src/models/json-schema/meta.ts
@@ -186,7 +186,7 @@ export const packedMetaLiteSchema = {
 				},
 			},
 		},
-		wellKnownWebsites: {
+		trustedLinkUrlPatterns: {
 			type: 'array',
 			optional: false, nullable: false,
 			items: {
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index cc367c9525..54071c47ed 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -371,7 +371,7 @@ export const meta = {
 				type: 'number',
 				optional: false, nullable: false,
 			},
-			wellKnownWebsites: {
+			trustedLinkUrlPatterns: {
 				type: 'array',
 				optional: false, nullable: false,
 				items: {
@@ -609,7 +609,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				perRemoteUserUserTimelineCacheMax: instance.perRemoteUserUserTimelineCacheMax,
 				perUserHomeTimelineCacheMax: instance.perUserHomeTimelineCacheMax,
 				perUserListTimelineCacheMax: instance.perUserListTimelineCacheMax,
-				wellKnownWebsites: instance.wellKnownWebsites,
+				trustedLinkUrlPatterns: instance.trustedLinkUrlPatterns,
 				notesPerOneAd: instance.notesPerOneAd,
 				summalyProxy: instance.urlPreviewSummaryProxyUrl,
 				urlPreviewEnabled: instance.urlPreviewEnabled,
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index 5804759040..28e0908d54 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -153,7 +153,7 @@ export const paramDef = {
 			type: 'string', nullable: true,
 			description: '[Deprecated] Use "urlPreviewSummaryProxyUrl" instead.',
 		},
-		wellKnownWebsites: {
+		trustedLinkUrlPatterns: {
 			type: 'array', nullable: true, items: {
 				type: 'string',
 			},
@@ -208,8 +208,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				});
 			}
 			
-			if (Array.isArray(ps.wellKnownWebsites)) {
-				set.wellKnownWebsites = ps.wellKnownWebsites.filter(Boolean);
+			if (Array.isArray(ps.trustedLinkUrlPatterns)) {
+				set.trustedLinkUrlPatterns = ps.trustedLinkUrlPatterns.filter(Boolean);
 			}
 
 			if (ps.themeColor !== undefined) {
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 5217360856..0e899b2a93 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -45,9 +45,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #caption>{{ i18n.ts.prohibitedWordsDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
 					</MkTextarea>
 
-					<MkTextarea v-model="wellKnownWebsites">
-						<template #label>{{ i18n.ts.wellKnownWebsites }}</template>
-						<template #caption>{{ i18n.ts.wellKnownWebsitesDescription }}</template>
+					<MkTextarea v-model="trustedLinkUrlPatterns">
+						<template #label>{{ i18n.ts.trustedLinkUrlPatterns }}</template>
+						<template #caption>{{ i18n.ts.trustedLinkUrlPatternsDescription }}</template>
 					</MkTextarea>
 
 					<MkTextarea v-model="hiddenTags">
@@ -91,7 +91,7 @@ const hiddenTags = ref<string>('');
 const preservedUsernames = ref<string>('');
 const tosUrl = ref<string | null>(null);
 const privacyPolicyUrl = ref<string | null>(null);
-const wellKnownWebsites = ref<string>('');
+const trustedLinkUrlPatterns = ref<string>('');
 
 async function init() {
 	const meta = await misskeyApi('admin/meta');
@@ -103,7 +103,7 @@ async function init() {
 	preservedUsernames.value = meta.preservedUsernames.join('\n');
 	tosUrl.value = meta.tosUrl;
 	privacyPolicyUrl.value = meta.privacyPolicyUrl;
-	wellKnownWebsites.value = meta.wellKnownWebsites.join('\n');
+	trustedLinkUrlPatterns.value = meta.trustedLinkUrlPatterns.join('\n');
 }
 
 function save() {
@@ -116,7 +116,7 @@ function save() {
 		prohibitedWords: prohibitedWords.value.split('\n'),
 		hiddenTags: hiddenTags.value.split('\n'),
 		preservedUsernames: preservedUsernames.value.split('\n'),
-		wellKnownWebsites: wellKnownWebsites.value.split('\n'),
+		trustedLinkUrlPatterns: trustedLinkUrlPatterns.value.split('\n'),
 	}).then(() => {
 		fetchInstance(true);
 	});
diff --git a/packages/frontend/src/scripts/warning-external-website.ts b/packages/frontend/src/scripts/warning-external-website.ts
index 9cca2b925d..327f1eaadf 100644
--- a/packages/frontend/src/scripts/warning-external-website.ts
+++ b/packages/frontend/src/scripts/warning-external-website.ts
@@ -15,7 +15,7 @@ const isRegExp = /^\/(.+)\/(.*)$/;
 export async function warningExternalWebsite(ev: MouseEvent, url: string) {
 	const domain = extractDomain.exec(url)?.[4];
 	const self = !domain || url.startsWith(local);
-	const isWellKnownWebsite = self || instance.wellKnownWebsites.some(expression => {
+	const isTrustedByInstance = self || instance.trustedLinkUrlPatterns.some(expression => {
 		const r = isRegExp.exec(expression);
 		if (r) {
 			return new RegExp(r[1], r[2]).test(url);
@@ -24,7 +24,7 @@ export async function warningExternalWebsite(ev: MouseEvent, url: string) {
 	});
 	const isTrustedByUser = defaultStore.reactiveState.trustedDomains.value.includes(domain);
 
-	if (!self && !isWellKnownWebsite && !isTrustedByUser) {
+	if (!self && !isTrustedByInstance && !isTrustedByUser) {
 		ev.preventDefault();
 		ev.stopPropagation();
 
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 3c3d052b2a..fe30111474 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4804,7 +4804,7 @@ export type components = {
           imageUrl: string;
           dayOfWeek: number;
         }[];
-      wellKnownWebsites: string[];
+      trustedLinkUrlPatterns: string[];
       /** @default 0 */
       notesPerOneAd: number;
       enableEmail: boolean;
@@ -4949,7 +4949,7 @@ export type operations = {
             perUserHomeTimelineCacheMax: number;
             perUserListTimelineCacheMax: number;
             notesPerOneAd: number;
-            wellKnownWebsites: string[];
+            trustedLinkUrlPatterns: string[];
             backgroundImageUrl: string | null;
             deeplAuthKey: string | null;
             deeplIsPro: boolean;
@@ -8930,7 +8930,7 @@ export type operations = {
           silencedHosts?: string[] | null;
           /** @description [Deprecated] Use "urlPreviewSummaryProxyUrl" instead. */
           summalyProxy?: string | null;
-          wellKnownWebsites?: string[] | null;
+          trustedLinkUrlPatterns?: string[] | null;
           urlPreviewEnabled?: boolean;
           urlPreviewTimeout?: number;
           urlPreviewMaximumContentLength?: number;

From 483bdc6ac9f5401902b35d8fcb6119c605b90f7b Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 24 Mar 2024 20:28:10 +0900
Subject: [PATCH 18/22] `_urlWarning` -> `_externalNavigationWarning`

---
 locales/index.d.ts                                      | 2 +-
 locales/ja-JP.yml                                       | 2 +-
 packages/frontend/src/components/MkUrlWarningDialog.vue | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 29aae74359..6986832f6f 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9842,7 +9842,7 @@ export interface Locale extends ILocale {
          */
         "summaryProxyDescription2": string;
     };
-    "_urlWarning": {
+    "_externalNavigationWarning": {
         /**
          * 外部サイトに移動します
          */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 1dba5722da..69394b0ac7 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2622,7 +2622,7 @@ _urlPreviewSetting:
   summaryProxyDescription: "Misskey本体ではなく、サマリープロキシを使用してプレビューを生成します。"
   summaryProxyDescription2: "プロキシには下記パラメータがクエリ文字列として連携されます。プロキシ側がこれらをサポートしない場合、設定値は無視されます。"
 
-_urlWarning:
+_externalNavigationWarning:
   title: "外部サイトに移動します"
   description: "別のサイトに移動しようとしています。\nリンク先の安全性を十分に確認した上で進んでください。"
   trustThisDomain: "今後{domain}のリンクを信頼する"
diff --git a/packages/frontend/src/components/MkUrlWarningDialog.vue b/packages/frontend/src/components/MkUrlWarningDialog.vue
index da5e4b401a..563bbbe616 100644
--- a/packages/frontend/src/components/MkUrlWarningDialog.vue
+++ b/packages/frontend/src/components/MkUrlWarningDialog.vue
@@ -10,11 +10,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div :class="$style.icon">
 				<i :class="$style.iconInner" class="ti ti-alert-triangle"></i>
 			</div>
-			<header :class="$style.title">{{ i18n.ts._urlWarning.title }}</header>
-			<div><Mfm :text="i18n.ts._urlWarning.description"/></div>
+			<header :class="$style.title">{{ i18n.ts._externalNavigationWarning.title }}</header>
+			<div><Mfm :text="i18n.ts._externalNavigationWarning.description"/></div>
 			<div class="_monospace" :class="$style.urlAddress">{{ url }}</div>
 			<div>
-				<MkSwitch v-model="trustThisDomain">{{ i18n.tsx._urlWarning.trustThisDomain({ domain }) }}</MkSwitch>
+				<MkSwitch v-model="trustThisDomain">{{ i18n.tsx._externalNavigationWarning.trustThisDomain({ domain }) }}</MkSwitch>
 			</div>
 		</div>
 		<div :class="$style.buttons">

From fb02dfafffb26b842bed1d445b357696131b6cd3 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:36:23 +0900
Subject: [PATCH 19/22] Update index.d.ts

---
 locales/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 6986832f6f..8094e1fa42 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4813,11 +4813,11 @@ export interface Locale extends ILocale {
      */
     "doReaction": string;
     /**
-     * よく知られたウェブサイト
+     * 外部サイトへのリンク警告 除外リスト
      */
     "trustedLinkUrlPatterns": string;
     /**
-     * スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、外部サイトへのリダイレクトの警告を省略させることができます。
+     * スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。ドメイン名だけ書くと後方一致になります。
      */
     "trustedLinkUrlPatternsDescription": string;
     /**

From 374cfe973916e52a9d4669a307cb0b04b1aed304 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 25 Mar 2024 20:50:41 +0900
Subject: [PATCH 20/22] wip

---
 .../src/components/MkUrlWarningDialog.vue     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/frontend/src/components/MkUrlWarningDialog.vue b/packages/frontend/src/components/MkUrlWarningDialog.vue
index 563bbbe616..2364388adc 100644
--- a/packages/frontend/src/components/MkUrlWarningDialog.vue
+++ b/packages/frontend/src/components/MkUrlWarningDialog.vue
@@ -7,10 +7,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkModal ref="modal" :preferType="'dialog'" :zPriority="'high'" @click="done(true)" @closed="emit('closed')">
 	<div :class="$style.root" class="_gaps">
 		<div class="_gaps_s">
-			<div :class="$style.icon">
-				<i :class="$style.iconInner" class="ti ti-alert-triangle"></i>
+			<div :class="$style.header">
+				<div :class="$style.icon">
+					<i class="ti ti-alert-triangle"></i>
+				</div>
+				<div :class="$style.title">{{ i18n.ts._externalNavigationWarning.title }}</div>
 			</div>
-			<header :class="$style.title">{{ i18n.ts._externalNavigationWarning.title }}</header>
 			<div><Mfm :text="i18n.ts._externalNavigationWarning.description"/></div>
 			<div class="_monospace" :class="$style.urlAddress">{{ url }}</div>
 			<div>
@@ -96,19 +98,19 @@ onBeforeUnmount(() => {
 	min-width: 320px;
 	max-width: 480px;
 	box-sizing: border-box;
-	text-align: center;
 	background: var(--panel);
 	border-radius: 16px;
 }
 
-.icon {
-	font-size: 24px;
-	color: var(--warn);
+.header {
+	display: flex;
+	align-items: center;
+	gap: 0.75em;
 }
 
-.iconInner {
-	display: block;
-	margin: 0 auto;
+.icon {
+	font-size: 18px;
+	color: var(--warn);
 }
 
 .title {

From c9b4801e5bada5671215dd4df06c2648f30ece7c Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 27 Mar 2024 15:42:33 +0900
Subject: [PATCH 21/22] wip

---
 locales/index.d.ts                                  | 13 ++++++++-----
 locales/ja-JP.yml                                   |  5 +++--
 .../frontend/src/components/MkUrlWarningDialog.vue  | 13 +++++++------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 8094e1fa42..2443114eb6 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4936,6 +4936,10 @@ export interface Locale extends ILocale {
      * バックアップコードを使う
      */
     "useBackupCode": string;
+    /**
+     * 開く
+     */
+    "open": string;
     "_bubbleGame": {
         /**
          * 遊び方
@@ -9848,14 +9852,13 @@ export interface Locale extends ILocale {
          */
         "title": string;
         /**
-         * 別のサイトに移動しようとしています。
-         * リンク先の安全性を十分に確認した上で進んでください。
+         * {host}を離れて外部サイトに移動します
          */
-        "description": string;
+        "description": ParameterizedString<"host">;
         /**
-         * 今後{domain}のリンクを信頼する
+         * このデバイスで今後このドメインを信頼する
          */
-        "trustThisDomain": ParameterizedString<"domain">;
+        "trustThisDomain": string;
     };
 }
 declare const locales: {
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 69394b0ac7..74429f31bd 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1230,6 +1230,7 @@ gameRetry: "リトライ"
 notUsePleaseLeaveBlank: "使用しない場合は空欄にしてください"
 useTotp: "ワンタイムパスワードを使う"
 useBackupCode: "バックアップコードを使う"
+open: "開く"
 
 _bubbleGame:
   howToPlay: "遊び方"
@@ -2624,5 +2625,5 @@ _urlPreviewSetting:
 
 _externalNavigationWarning:
   title: "外部サイトに移動します"
-  description: "別のサイトに移動しようとしています。\nリンク先の安全性を十分に確認した上で進んでください。"
-  trustThisDomain: "今後{domain}のリンクを信頼する"
+  description: "{host}を離れて外部サイトに移動します"
+  trustThisDomain: "このデバイスで今後このドメインを信頼する"
diff --git a/packages/frontend/src/components/MkUrlWarningDialog.vue b/packages/frontend/src/components/MkUrlWarningDialog.vue
index 2364388adc..e653574f0b 100644
--- a/packages/frontend/src/components/MkUrlWarningDialog.vue
+++ b/packages/frontend/src/components/MkUrlWarningDialog.vue
@@ -13,15 +13,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 				<div :class="$style.title">{{ i18n.ts._externalNavigationWarning.title }}</div>
 			</div>
-			<div><Mfm :text="i18n.ts._externalNavigationWarning.description"/></div>
+			<div><Mfm :text="i18n.tsx._externalNavigationWarning.description({ host: instanceName })"/></div>
 			<div class="_monospace" :class="$style.urlAddress">{{ url }}</div>
 			<div>
-				<MkSwitch v-model="trustThisDomain">{{ i18n.tsx._externalNavigationWarning.trustThisDomain({ domain }) }}</MkSwitch>
+				<MkSwitch v-model="trustThisDomain">{{ i18n.ts._externalNavigationWarning.trustThisDomain }}</MkSwitch>
 			</div>
 		</div>
 		<div :class="$style.buttons">
-			<MkButton data-cy-modal-dialog-ok inline primary rounded @click="ok">{{ i18n.ts.ok }}</MkButton>
 			<MkButton data-cy-modal-dialog-cancel inline rounded @click="cancel">{{ i18n.ts.cancel }}</MkButton>
+			<MkButton data-cy-modal-dialog-ok inline primary rounded @click="ok"><i class="ti ti-external-link"></i> {{ i18n.ts.open }}</MkButton>
 		</div>
 	</div>
 </MkModal>
@@ -34,6 +34,7 @@ import MkButton from '@/components/MkButton.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import { i18n } from '@/i18n.js';
 import { defaultStore } from '@/store.js';
+import { instanceName } from '@/config';
 
 type Result = string | number | true | null;
 
@@ -119,8 +120,8 @@ onBeforeUnmount(() => {
 }
 
 .urlAddress {
-	padding: var(--margin);
-	border-radius: calc(var(--radius) / 2);
+	padding: 10px 14px;
+	border-radius: 8px;
 	border: 1px solid var(--divider);
 	overflow-x: auto;
 	white-space: nowrap;
@@ -130,6 +131,6 @@ onBeforeUnmount(() => {
 	display: flex;
 	gap: 8px;
 	flex-wrap: wrap;
-	justify-content: center;
+	justify-content: right;
 }
 </style>

From ca549923bafe308c9fa52f38f9bd6d6c7909021e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 29 Mar 2024 20:01:36 +0900
Subject: [PATCH 22/22] clean up

---
 packages/frontend/src/pages/settings/general.vue | 2 --
 packages/frontend/src/store.ts                   | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 0adc2530d4..285f874dde 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -59,7 +59,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="showReactionsCount">{{ i18n.ts.showReactionsCount }}</MkSwitch>
 				<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
 				<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
-				<MkSwitch v-model="checkRedirectingOtherHost">{{ i18n.ts.checkRedirectingOtherHost }}</MkSwitch>
 				<MkRadios v-model="reactionsDisplaySize">
 					<template #label>{{ i18n.ts.reactionsDisplaySize }}</template>
 					<option value="small">{{ i18n.ts.small }}</option>
@@ -290,7 +289,6 @@ const disableDrawer = computed(defaultStore.makeGetterSetter('disableDrawer'));
 const disableShowingAnimatedImages = computed(defaultStore.makeGetterSetter('disableShowingAnimatedImages'));
 const forceShowAds = computed(defaultStore.makeGetterSetter('forceShowAds'));
 const loadRawImages = computed(defaultStore.makeGetterSetter('loadRawImages'));
-const checkRedirectingOtherHost = computed(defaultStore.makeGetterSetter('checkRedirectingOtherHost'));
 const highlightSensitiveMedia = computed(defaultStore.makeGetterSetter('highlightSensitiveMedia'));
 const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
 const nsfw = computed(defaultStore.makeGetterSetter('nsfw'));
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index b677ea6765..01e5eefd83 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -238,10 +238,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
-	checkRedirectingOtherHost: {
-		where: 'device',
-		default: true,
-	},
 	imageNewTab: {
 		where: 'device',
 		default: false,