fix

misskey-dev · Mar 22, 2024 · 7089341 · 7089341
1 parent 4ca7214
commit 7089341
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -5,21 +5,25 @@
 
 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);
 		if (r) {
 			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();