From ca32c231d0aaab9dacaa88a0b0564d626827e797 Mon Sep 17 00:00:00 2001
From: piuvas <mail@piuvas.net>
Date: Mon, 26 May 2025 22:44:29 -0300
Subject: initial link attributions work.

---
 .../backend/src/server/web/UrlPreviewService.ts    | 50 +++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 203bc908a8..d5d62c67c0 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -19,7 +19,8 @@ import { MiMeta } from '@/models/Meta.js';
 import { RedisKVCache } from '@/misc/cache.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
-import type { MiAccessToken, NotesRepository } from '@/models/_.js';
+import type { MiAccessToken, NotesRepository, UsersRepository } from '@/models/_.js';
+import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
 import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
 import { ApRequestService } from '@/core/activitypub/ApRequestService.js';
 import { SystemAccountService } from '@/core/SystemAccountService.js';
@@ -34,6 +35,12 @@ import type { FastifyRequest, FastifyReply } from 'fastify';
 
 export type LocalSummalyResult = SummalyResult & {
 	haveNoteLocally?: boolean;
+	linkAttribution?: {
+		name: string,
+		username: string,
+		avatarUrl: string,
+		avatarBlurhash: string,
+	}
 };
 
 // Increment this to invalidate cached previews after a major change.
@@ -77,11 +84,15 @@ export class UrlPreviewService {
 		@Inject(DI.notesRepository)
 		private readonly notesRepository: NotesRepository,
 
+		@Inject(DI.usersRepository)
+		private readonly usersRepository: UsersRepository,
+
 		private httpRequestService: HttpRequestService,
 		private loggerService: LoggerService,
 		private readonly utilityService: UtilityService,
 		private readonly apUtilityService: ApUtilityService,
 		private readonly apDbResolverService: ApDbResolverService,
+		private readonly remoteUserResolveService: RemoteUserResolveService,
 		private readonly apRequestService: ApRequestService,
 		private readonly systemAccountService: SystemAccountService,
 		private readonly apNoteService: ApNoteService,
@@ -206,6 +217,8 @@ export class UrlPreviewService {
 				}
 			}
 
+			await this.validateLinkAttribution(summary);
+
 			// Await this to avoid hammering redis when a bunch of URLs are fetched at once
 			await this.previewCache.set(cacheKey, summary);
 
@@ -426,6 +439,41 @@ export class UrlPreviewService {
 		}
 	}
 
+	private async validateLinkAttribution(summary: LocalSummalyResult) {
+		if (!summary.fediverseCreator) return;
+
+		const url = URL.parse(summary.url);
+		if (!url) return;
+		let fediverseCreator = summary.fediverseCreator;
+		// expecting either '@username@host' or 'username@host'
+		if (fediverseCreator.startsWith('@')) {
+			fediverseCreator = fediverseCreator.substring(1);
+		}
+
+		//
+		const array = fediverseCreator.split('@');
+		const username = array[0].toLowerCase();
+		let host: string | null = array[1];
+		if (host.toLowerCase() === this.config.host) {
+			host = null;
+		}
+		try {
+			const user = await this.remoteUserResolveService.resolveUser(username, host)
+
+			const attributionDomains = user.attributionDomains;
+			if (attributionDomains.some(x => `.${url.host.toLowerCase()}`.endsWith(`.${x}`))) {
+				summary.linkAttribution = {
+					name: user.name ?? user.username,
+					username: fediverseCreator,
+					avatarUrl: user.avatarUrl ?? '',
+					avatarBlurhash: user.avatarBlurhash ?? '',
+				}
+			}
+		} catch {
+			console.warn('user not found: ' + fediverseCreator)
+		}
+	}
+
 	// Adapted from ApiCallService
 	private async checkFetchPermissions(auth: AuthArray, reply: FastifyReply): Promise<boolean> {
 		const [user, app] = auth;
-- 
cgit v1.2.3-freya


From 6874a318ea19bc1da8f990db1fa226d63e3c5397 Mon Sep 17 00:00:00 2001
From: piuvas <mail@piuvas.net>
Date: Mon, 26 May 2025 23:34:31 -0300
Subject: small fixes.

---
 packages/backend/src/server/web/UrlPreviewService.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index d5d62c67c0..854f6b9847 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -19,7 +19,7 @@ import { MiMeta } from '@/models/Meta.js';
 import { RedisKVCache } from '@/misc/cache.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
-import type { MiAccessToken, NotesRepository, UsersRepository } from '@/models/_.js';
+import type { MiAccessToken, NotesRepository } from '@/models/_.js';
 import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
 import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
 import { ApRequestService } from '@/core/activitypub/ApRequestService.js';
@@ -84,9 +84,6 @@ export class UrlPreviewService {
 		@Inject(DI.notesRepository)
 		private readonly notesRepository: NotesRepository,
 
-		@Inject(DI.usersRepository)
-		private readonly usersRepository: UsersRepository,
-
 		private httpRequestService: HttpRequestService,
 		private loggerService: LoggerService,
 		private readonly utilityService: UtilityService,
@@ -450,7 +447,6 @@ export class UrlPreviewService {
 			fediverseCreator = fediverseCreator.substring(1);
 		}
 
-		//
 		const array = fediverseCreator.split('@');
 		const username = array[0].toLowerCase();
 		let host: string | null = array[1];
-- 
cgit v1.2.3-freya


From 604c6dbc669bc4a2a3238a8c3f0f500d78dfa33e Mon Sep 17 00:00:00 2001
From: piuvas <mail@piuvas.net>
Date: Tue, 27 May 2025 00:14:41 -0300
Subject: add missing semicolons.

---
 packages/backend/src/server/web/UrlPreviewService.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 854f6b9847..b50e5d49fd 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -454,7 +454,7 @@ export class UrlPreviewService {
 			host = null;
 		}
 		try {
-			const user = await this.remoteUserResolveService.resolveUser(username, host)
+			const user = await this.remoteUserResolveService.resolveUser(username, host);
 
 			const attributionDomains = user.attributionDomains;
 			if (attributionDomains.some(x => `.${url.host.toLowerCase()}`.endsWith(`.${x}`))) {
@@ -463,10 +463,10 @@ export class UrlPreviewService {
 					username: fediverseCreator,
 					avatarUrl: user.avatarUrl ?? '',
 					avatarBlurhash: user.avatarBlurhash ?? '',
-				}
+				};
 			}
 		} catch {
-			console.warn('user not found: ' + fediverseCreator)
+			console.warn('user not found: ' + fediverseCreator);
 		}
 	}
 
-- 
cgit v1.2.3-freya


From 5545ddf9ddefa5620c58ea34b2e6fdf18fdac30a Mon Sep 17 00:00:00 2001
From: piuvas <mail@piuvas.net>
Date: Tue, 27 May 2025 13:25:06 -0300
Subject: requested changes.

---
 locales/index.d.ts                                 |  4 +--
 packages/backend/src/models/json-schema/user.ts    |  2 +-
 .../backend/src/server/web/UrlPreviewService.ts    | 18 +++++-----
 packages/frontend/src/components/MkUrlPreview.vue  | 41 ++++++++++------------
 packages/frontend/src/pages/settings/profile.vue   |  2 --
 sharkey-locales/en-US.yml                          |  2 +-
 sharkey-locales/pt-PT.yml                          |  2 +-
 7 files changed, 32 insertions(+), 39 deletions(-)

(limited to 'packages/backend/src/server/web')

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 1070318fa2..f809613e7a 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -13138,9 +13138,9 @@ export interface Locale extends ILocale {
      */
     "attributionDomainsDescription": string;
     /**
-     * Written by
+     * Written by {user}
      */
-    "writtenBy": string;
+    "writtenBy": ParameterizedString<"user">;
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 9bfb57fc66..82d354cfd0 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -237,7 +237,7 @@ export const packedUserLiteSchema = {
 			},
 		},
 		attributionDomains: {
-			type: 'object',
+			type: 'array',
 			nullable: false, optional: false,
 			additionalProperties: {
 				type: 'string',
diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index b50e5d49fd..ccf8fa342d 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -28,7 +28,7 @@ import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js';
 import { AuthenticateService, AuthenticationError } from '@/server/api/AuthenticateService.js';
 import { SkRateLimiterService } from '@/server/SkRateLimiterService.js';
 import { BucketRateLimit, Keyed, sendRateLimitHeaders } from '@/misc/rate-limit-utils.js';
-import type { MiLocalUser } from '@/models/User.js';
+import type { MiLocalUser, MiUser } from '@/models/User.js';
 import { getIpHash } from '@/misc/get-ip-hash.js';
 import { isRetryableError } from '@/misc/is-retryable-error.js';
 import type { FastifyRequest, FastifyReply } from 'fastify';
@@ -36,10 +36,7 @@ import type { FastifyRequest, FastifyReply } from 'fastify';
 export type LocalSummalyResult = SummalyResult & {
 	haveNoteLocally?: boolean;
 	linkAttribution?: {
-		name: string,
-		username: string,
-		avatarUrl: string,
-		avatarBlurhash: string,
+		user: MiUser,
 	}
 };
 
@@ -448,6 +445,10 @@ export class UrlPreviewService {
 		}
 
 		const array = fediverseCreator.split('@');
+
+		// make sure we only have username@host.
+		if (array.length !== 2) return;
+
 		const username = array[0].toLowerCase();
 		let host: string | null = array[1];
 		if (host.toLowerCase() === this.config.host) {
@@ -459,14 +460,11 @@ export class UrlPreviewService {
 			const attributionDomains = user.attributionDomains;
 			if (attributionDomains.some(x => `.${url.host.toLowerCase()}`.endsWith(`.${x}`))) {
 				summary.linkAttribution = {
-					name: user.name ?? user.username,
-					username: fediverseCreator,
-					avatarUrl: user.avatarUrl ?? '',
-					avatarBlurhash: user.avatarBlurhash ?? '',
+					user: user,
 				};
 			}
 		} catch {
-			console.warn('user not found: ' + fediverseCreator);
+			this.logger.warn('user not found: ' + fediverseCreator);
 		}
 	}
 
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index ca8f6848e5..0cba73ef05 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -65,13 +65,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</footer>
 		</article>
 	</component>
-	<footer v-if="linkAttribution" :class="$style.footer" style="text-align: right">
-		<a :href="'/@' + linkAttribution.username">
-			<p :class="$style.linkAttribution">{{ i18n.ts.writtenBy }}</p>
-			<MkImgWithBlurhash :class="$style.linkAttributionIcon" :src="linkAttribution.avatarUrl" :hash="linkAttribution.avatarBlurhash" :cover="true" :onlyAvgColor="true"/>
-			<b :class="$style.linkAttribution" style="color: var(--MI_THEME-accent)">{{ linkAttribution.name }}</b>
-		</a>
-	</footer>
+	<I18n v-if="linkAttribution" :src="i18n.ts.writtenBy" :class="$style.linkAttribution" tag="p">
+		<template #user>
+			<MkA v-user-preview="linkAttribution.user.id" :to="userPage(linkAttribution.user)">
+				<MkAvatar :class="$style.linkAttributionIcon" :user="linkAttribution.user"/>
+				<MkUserName :user="linkAttribution.user" style="color: var(--MI_THEME-accent)"/>
+			</MkA>
+		</template>
+	</I18n>
 	<template v-if="showActions">
 		<div v-if="tweetId" :class="$style.action">
 			<MkButton :small="true" inline @click="tweetExpanded = true">
@@ -114,6 +115,7 @@ import { misskeyApi } from '@/utility/misskey-api.js';
 import { warningExternalWebsite } from '@/utility/warning-external-website.js';
 import DynamicNoteSimple from '@/components/DynamicNoteSimple.vue';
 import { $i } from '@/i';
+import { userPage } from '@/filters/user.js';
 
 type SummalyResult = Awaited<ReturnType<typeof summaly>>;
 
@@ -155,10 +157,7 @@ const player = ref<SummalyResult['player']>({
 	allow: [],
 });
 const linkAttribution = ref<{
-	name: string,
-	username: string,
-	avatarUrl: string,
-	avatarBlurhash: string,
+	user: Misskey.entities.User,
 } | null>(null);
 const playerEnabled = ref(false);
 const tweetId = ref<string | null>(null);
@@ -238,10 +237,7 @@ function refresh(withFetch = false) {
 		.then(async (info: SummalyResult & {
 			haveNoteLocally?: boolean,
 			linkAttribution?: {
-				name: string,
-				username: string,
-				avatarUrl: string,
-				avatarBlurhash: string,
+				user: Misskey.entities.User
 			}
 		} | null) => {
 			unknownUrl.value = info == null;
@@ -420,11 +416,11 @@ refresh();
 
 .linkAttributionIcon {
 	display: inline-block;
-	width: 1em;
-	height: 1em;
-	margin-left: 0.5em;
+	width: 16px;
+	height: 16px;
+	margin-left: 0.25em;
 	margin-right: 0.25em;
-	vertical-align: top;
+	vertical-align: middle;
 	border-radius: 50%;
 	* {
 		border-radius: 4px;
@@ -432,11 +428,12 @@ refresh();
 }
 
 .linkAttribution {
+	width: 100%;
 	font-size: 0.8em;
 	display: inline-block;
-	margin: 0;
-	line-height: 16px;
-	vertical-align: top;
+	margin: auto;
+	padding-top: 0.5em;
+	text-align: right;
 }
 
 .action {
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 9dc7398062..4cc13a2552 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -220,7 +220,6 @@ const profile = reactive({
 	isBot: $i.isBot ?? false,
 	isCat: $i.isCat ?? false,
 	speakAsCat: $i.speakAsCat ?? false,
-	attributionDomains: $i.attributionDomains,
 });
 
 watch(() => profile, () => {
@@ -280,7 +279,6 @@ function save() {
 		isBot: !!profile.isBot,
 		isCat: !!profile.isCat,
 		speakAsCat: !!profile.speakAsCat,
-		attributionDomains: !!profile.attributionDomains,
 	}, undefined, {
 		'0b3f9f6a-2f4d-4b1f-9fb4-49d3a2fd7191': {
 			title: i18n.ts.yourNameContainsProhibitedWords,
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index bfd0613cc7..0ad01b96be 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -592,4 +592,4 @@ translationTimeoutCaption: "Timeout in milliseconds for translation API requests
 
 attributionDomains: "Attribution Domains"
 attributionDomainsDescription: "A list of domains whose content can be attributed to you on link previews, separated by new-line. Any subdomain will also be valid. The following needs to be on the webpage:"
-writtenBy: "Written by"
+writtenBy: "Written by {user}"
diff --git a/sharkey-locales/pt-PT.yml b/sharkey-locales/pt-PT.yml
index e522125e6c..7220cd2b59 100644
--- a/sharkey-locales/pt-PT.yml
+++ b/sharkey-locales/pt-PT.yml
@@ -9,4 +9,4 @@ pinnedOnly: "Fixado"
 blockingYou: "Bloqueando você"
 attributionDomains: "Domínios de Atribuição"
 attributionDomainsDescription: "Uma lista de domínios cujo conteúdo pode ser atribuído a você em prévias de link, separadas por linha. Qualquer subdomínio também será válido. O código seguinte precisa estar presente na página:"
-writtenBy: "Escrito por"
+writtenBy: "Escrito por {user}"
-- 
cgit v1.2.3-freya


From 56db26f236a5a4fcf937f10019a0ce14c0ffc057 Mon Sep 17 00:00:00 2001
From: piuvas <mail@piuvas.net>
Date: Tue, 27 May 2025 17:12:02 -0300
Subject: some requested changes to linkAttribution.

---
 .../backend/src/server/web/UrlPreviewService.ts    | 32 ++++++++--------------
 packages/frontend/src/components/MkUrlPreview.vue  | 21 +++++++++-----
 .../pages/settings/attribution-domains-setting.vue |  2 +-
 3 files changed, 26 insertions(+), 29 deletions(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index ccf8fa342d..2a300782c6 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -28,15 +28,16 @@ import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js';
 import { AuthenticateService, AuthenticationError } from '@/server/api/AuthenticateService.js';
 import { SkRateLimiterService } from '@/server/SkRateLimiterService.js';
 import { BucketRateLimit, Keyed, sendRateLimitHeaders } from '@/misc/rate-limit-utils.js';
-import type { MiLocalUser, MiUser } from '@/models/User.js';
+import type { MiLocalUser } from '@/models/User.js';
 import { getIpHash } from '@/misc/get-ip-hash.js';
 import { isRetryableError } from '@/misc/is-retryable-error.js';
+import * as Acct from '@/misc/acct.js';
 import type { FastifyRequest, FastifyReply } from 'fastify';
 
 export type LocalSummalyResult = SummalyResult & {
 	haveNoteLocally?: boolean;
 	linkAttribution?: {
-		user: MiUser,
+		userId: string,
 	}
 };
 
@@ -435,36 +436,25 @@ export class UrlPreviewService {
 
 	private async validateLinkAttribution(summary: LocalSummalyResult) {
 		if (!summary.fediverseCreator) return;
+		if (!URL.canParse(summary.url)) return;
 
 		const url = URL.parse(summary.url);
-		if (!url) return;
-		let fediverseCreator = summary.fediverseCreator;
-		// expecting either '@username@host' or 'username@host'
-		if (fediverseCreator.startsWith('@')) {
-			fediverseCreator = fediverseCreator.substring(1);
-		}
-
-		const array = fediverseCreator.split('@');
-
-		// make sure we only have username@host.
-		if (array.length !== 2) return;
 
-		const username = array[0].toLowerCase();
-		let host: string | null = array[1];
-		if (host.toLowerCase() === this.config.host) {
-			host = null;
+		const acct = Acct.parse(summary.fediverseCreator);
+		if (acct.host?.toLowerCase() === this.config.host) {
+			acct.host = null;
 		}
 		try {
-			const user = await this.remoteUserResolveService.resolveUser(username, host);
+			const user = await this.remoteUserResolveService.resolveUser(acct.username, acct.host);
 
 			const attributionDomains = user.attributionDomains;
-			if (attributionDomains.some(x => `.${url.host.toLowerCase()}`.endsWith(`.${x}`))) {
+			if (attributionDomains.some(x => `.${url?.host.toLowerCase()}`.endsWith(`.${x}`))) {
 				summary.linkAttribution = {
-					user: user,
+					userId: user.id,
 				};
 			}
 		} catch {
-			this.logger.warn('user not found: ' + fediverseCreator);
+			this.logger.debug('User not found: ' + summary.fediverseCreator);
 		}
 	}
 
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index 0cba73ef05..4948da2f75 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -65,14 +65,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</footer>
 		</article>
 	</component>
-	<I18n v-if="linkAttribution" :src="i18n.ts.writtenBy" :class="$style.linkAttribution" tag="p">
+
+	<I18n v-if="attributionUser" :src="i18n.ts.writtenBy" :class="$style.linkAttribution" tag="p">
 		<template #user>
-			<MkA v-user-preview="linkAttribution.user.id" :to="userPage(linkAttribution.user)">
-				<MkAvatar :class="$style.linkAttributionIcon" :user="linkAttribution.user"/>
-				<MkUserName :user="linkAttribution.user" style="color: var(--MI_THEME-accent)"/>
+			<MkA v-user-preview="attributionUser.id" :to="userPage(attributionUser)">
+				<MkAvatar :class="$style.linkAttributionIcon" :user="attributionUser"/>
+				<MkUserName :user="attributionUser" style="color: var(--MI_THEME-accent)"/>
 			</MkA>
 		</template>
 	</I18n>
+	<p v-else-if="linkAttribution" :class="$style.linkAttributionIcon"><MkEllipsis/></p>
+
 	<template v-if="showActions">
 		<div v-if="tweetId" :class="$style.action">
 			<MkButton :small="true" inline @click="tweetExpanded = true">
@@ -107,7 +110,6 @@ import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 import { deviceKind } from '@/utility/device-kind.js';
 import MkButton from '@/components/MkButton.vue';
-import MkImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import { transformPlayerUrl } from '@/utility/player-url-transform.js';
 import { store } from '@/store.js';
 import { prefer } from '@/preferences.js';
@@ -157,8 +159,9 @@ const player = ref<SummalyResult['player']>({
 	allow: [],
 });
 const linkAttribution = ref<{
-	user: Misskey.entities.User,
+	userId: string,
 } | null>(null);
+const attributionUser = ref<Misskey.entities.User | null>(null);
 const playerEnabled = ref(false);
 const tweetId = ref<string | null>(null);
 const tweetExpanded = ref(props.detail);
@@ -237,7 +240,7 @@ function refresh(withFetch = false) {
 		.then(async (info: SummalyResult & {
 			haveNoteLocally?: boolean,
 			linkAttribution?: {
-				user: Misskey.entities.User
+				userId: string,
 			}
 		} | null) => {
 			unknownUrl.value = info == null;
@@ -255,6 +258,10 @@ function refresh(withFetch = false) {
 			sensitive.value = info?.sensitive ?? false;
 			activityPub.value = info?.activityPub ?? null;
 			linkAttribution.value = info?.linkAttribution ?? null;
+			if (linkAttribution.value) {
+				misskeyApi('users/show', { userId: linkAttribution.value.userId })
+					.then(u => attributionUser.value = u);
+			}
 
 			theNote.value = null;
 			if (info?.haveNoteLocally) {
diff --git a/packages/frontend/src/pages/settings/attribution-domains-setting.vue b/packages/frontend/src/pages/settings/attribution-domains-setting.vue
index 245ab8fe74..59922a4e0f 100644
--- a/packages/frontend/src/pages/settings/attribution-domains-setting.vue
+++ b/packages/frontend/src/pages/settings/attribution-domains-setting.vue
@@ -38,7 +38,7 @@ const autochange = ref(false);
 const tutorialTag = '`<meta name="fediverse:creator" content="' + $i.username + '@' + toUnicode(hostRaw) + '" />`';
 
 async function save() {
-	let domains = attributionDomains.value
+	const domains = attributionDomains.value
 		.trim().split('\n')
 		.map(el => el.trim().toLowerCase())
 		.filter(el => el);
-- 
cgit v1.2.3-freya


From f4107b1c2b0632504b9fefb6c8c5608282313cc2 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 28 May 2025 13:31:24 -0400
Subject: check if previews are disabled before anything else

---
 packages/backend/src/server/web/UrlPreviewService.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 2a300782c6..160cf37c00 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -123,6 +123,16 @@ export class UrlPreviewService {
 		request: FastifyRequest<PreviewRoute>,
 		reply: FastifyReply,
 	): Promise<void> {
+		if (!this.meta.urlPreviewEnabled) {
+			return reply.code(403).send({
+				error: {
+					message: 'URL preview is disabled',
+					code: 'URL_PREVIEW_DISABLED',
+					id: '58b36e13-d2f5-0323-b0c6-76aa9dabefb8',
+				},
+			});
+		}
+
 		const url = request.query.url;
 		if (typeof url !== 'string' || !URL.canParse(url)) {
 			reply.code(400);
@@ -135,16 +145,6 @@ export class UrlPreviewService {
 			return;
 		}
 
-		if (!this.meta.urlPreviewEnabled) {
-			return reply.code(403).send({
-				error: {
-					message: 'URL preview is disabled',
-					code: 'URL_PREVIEW_DISABLED',
-					id: '58b36e13-d2f5-0323-b0c6-76aa9dabefb8',
-				},
-			});
-		}
-
 		// Check rate limit
 		const auth = await this.authenticate(request);
 		if (!await this.checkRateLimit(auth, reply)) {
-- 
cgit v1.2.3-freya


From f601cff5c5222d6f3a7c06ecbafb3d07ad63997f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 28 May 2025 13:31:40 -0400
Subject: check input URL scheme before continuing

---
 packages/backend/src/server/web/UrlPreviewService.ts | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 160cf37c00..da2660ab0f 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -139,6 +139,13 @@ export class UrlPreviewService {
 			return;
 		}
 
+		// Enforce HTTP(S) for input URLs
+		const urlScheme = this.utilityService.getUrlScheme(url);
+		if (urlScheme !== 'http:' && urlScheme !== 'https:') {
+			reply.code(400);
+			return;
+		}
+
 		const lang = request.query.lang;
 		if (Array.isArray(lang)) {
 			reply.code(400);
-- 
cgit v1.2.3-freya


From 865b198ab31688de957d82ea447e11be78f718dc Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 28 May 2025 13:32:04 -0400
Subject: redirect to exclude hash from preview URL

---
 packages/backend/src/server/web/UrlPreviewService.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index da2660ab0f..3e0133d50e 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -152,13 +152,25 @@ export class UrlPreviewService {
 			return;
 		}
 
+		// Strip out hash (anchor)
+		const urlObj = new URL(url);
+		if (urlObj.hash) {
+			urlObj.hash = '';
+			const params = new URLSearchParams({ url: urlObj.href });
+			if (lang) params.set('lang', lang);
+			const newUrl = `/url?${params.toString()}`;
+
+			reply.redirect(newUrl, 301);
+			return;
+		}
+
 		// Check rate limit
 		const auth = await this.authenticate(request);
 		if (!await this.checkRateLimit(auth, reply)) {
 			return;
 		}
 
-		if (this.utilityService.isBlockedHost(this.meta.blockedHosts, new URL(url).host)) {
+		if (this.utilityService.isBlockedHost(this.meta.blockedHosts, urlObj.host)) {
 			return reply.code(403).send({
 				error: {
 					message: 'URL is blocked',
-- 
cgit v1.2.3-freya


From a91c0de9b5b337fdb65fbd922969132d610bd8c4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 28 May 2025 13:32:21 -0400
Subject: cache alternate URLs in UrlPreviewService

---
 packages/backend/src/server/web/UrlPreviewService.ts | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 3e0133d50e..78b2204fbb 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -185,7 +185,7 @@ export class UrlPreviewService {
 			return;
 		}
 
-		const cacheKey = `${url}@${lang}@${cacheFormatVersion}`;
+		const cacheKey = getCacheKey(url, lang);
 		if (await this.sendCachedPreview(cacheKey, reply, fetch)) {
 			return;
 		}
@@ -236,6 +236,18 @@ export class UrlPreviewService {
 			// Await this to avoid hammering redis when a bunch of URLs are fetched at once
 			await this.previewCache.set(cacheKey, summary);
 
+			// Also cache the response URL in case of redirects
+			if (summary.url !== url) {
+				const responseCacheKey = getCacheKey(summary.url, lang);
+				await this.previewCache.set(responseCacheKey, summary);
+			}
+
+			// Also cache the ActivityPub URL, if different from the others
+			if (summary.activityPub && summary.activityPub !== summary.url) {
+				const apCacheKey = getCacheKey(summary.activityPub, lang);
+				await this.previewCache.set(apCacheKey, summary);
+			}
+
 			// Cache 1 day (matching redis), but only once we finalize the result
 			if (!summary.activityPub || summary.haveNoteLocally) {
 				reply.header('Cache-Control', 'public, max-age=86400');
@@ -552,3 +564,7 @@ export class UrlPreviewService {
 		return true;
 	}
 }
+
+function getCacheKey(url: string, lang = 'none') {
+	return `${url}@${lang}@${cacheFormatVersion}`;
+}
-- 
cgit v1.2.3-freya


From 36b85d62c2086ce0a64874fc7e4af06a423305b5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 7 Jun 2025 18:50:28 -0400
Subject: check that detected AP object is actually a note before recording it
 in UrlPreviewService

---
 packages/backend/src/server/web/UrlPreviewService.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 78b2204fbb..ed5d87d15d 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -32,6 +32,7 @@ import type { MiLocalUser } from '@/models/User.js';
 import { getIpHash } from '@/misc/get-ip-hash.js';
 import { isRetryableError } from '@/misc/is-retryable-error.js';
 import * as Acct from '@/misc/acct.js';
+import { isNote } from '@/core/activitypub/type.js';
 import type { FastifyRequest, FastifyReply } from 'fastify';
 
 export type LocalSummalyResult = SummalyResult & {
@@ -42,7 +43,7 @@ export type LocalSummalyResult = SummalyResult & {
 };
 
 // Increment this to invalidate cached previews after a major change.
-const cacheFormatVersion = 3;
+const cacheFormatVersion = 4;
 
 type PreviewRoute = {
 	Querystring: {
@@ -409,7 +410,7 @@ export class UrlPreviewService {
 		// Finally, attempt a signed GET in case it's a direct link to an instance with authorized fetch.
 		const instanceActor = await this.systemAccountService.getInstanceActor();
 		const remoteObject = await this.apRequestService.signedGet(summary.url, instanceActor).catch(() => null);
-		if (remoteObject && this.apUtilityService.haveSameAuthority(remoteObject.id, summary.url)) {
+		if (remoteObject && isNote(remoteObject) && this.apUtilityService.haveSameAuthority(remoteObject.id, summary.url)) {
 			summary.activityPub = remoteObject.id;
 			return;
 		}
-- 
cgit v1.2.3-freya


From 7eca06d672604fe03ce10591263bd04cf58e54c6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 23 May 2025 19:48:55 -0400
Subject: use pnpm package alias for @transfem-org/sfm-js

---
 packages/backend/package.json                                  | 2 +-
 packages/backend/src/core/MfmService.ts                        | 2 +-
 packages/backend/src/core/NoteCreateService.ts                 | 2 +-
 packages/backend/src/core/NoteEditService.ts                   | 2 +-
 packages/backend/src/core/activitypub/ApMfmService.ts          | 2 +-
 packages/backend/src/core/activitypub/ApRendererService.ts     | 2 +-
 packages/backend/src/misc/extract-custom-emojis-from-mfm.ts    | 2 +-
 packages/backend/src/misc/extract-hashtags.ts                  | 2 +-
 packages/backend/src/misc/extract-mentions.ts                  | 2 +-
 packages/backend/src/server/api/endpoints/i/update.ts          | 2 +-
 packages/backend/src/server/api/mastodon/MastodonConverters.ts | 2 +-
 packages/backend/src/server/web/FeedService.ts                 | 2 +-
 packages/backend/test/unit/MfmService.ts                       | 2 +-
 packages/backend/test/unit/extract-mentions.ts                 | 2 +-
 packages/frontend-embed/package.json                           | 4 ++--
 packages/frontend-embed/src/components/EmMfm.ts                | 2 +-
 packages/frontend-embed/src/components/EmNote.vue              | 2 +-
 packages/frontend-embed/src/components/EmNoteDetailed.vue      | 2 +-
 packages/frontend/package.json                                 | 2 +-
 packages/frontend/src/components/MkNote.vue                    | 2 +-
 packages/frontend/src/components/MkNoteDetailed.vue            | 2 +-
 packages/frontend/src/components/MkPostForm.vue                | 2 +-
 packages/frontend/src/components/MkSubNoteContent.vue          | 2 +-
 packages/frontend/src/components/SkNote.vue                    | 2 +-
 packages/frontend/src/components/SkNoteDetailed.vue            | 2 +-
 packages/frontend/src/components/SkOldNoteWindow.vue           | 2 +-
 packages/frontend/src/components/global/MkMfm.ts               | 2 +-
 packages/frontend/src/pages/chat/XMessage.vue                  | 2 +-
 packages/frontend/src/utility/check-animated-mfm.ts            | 2 +-
 packages/frontend/src/utility/extract-mentions.ts              | 2 +-
 packages/frontend/src/utility/extract-preview-urls.ts          | 2 +-
 packages/frontend/src/utility/extract-url-from-mfm.ts          | 2 +-
 32 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 69d38f3bfb..70432d1bd1 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -92,7 +92,7 @@
 		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.7.3",
 		"@swc/core": "1.11.24",
-		"@transfem-org/sfm-js": "0.24.6",
+		"mfm-js": "npm:@transfem-org/sfm-js@0.24.6",
 		"@twemoji/parser": "15.1.1",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts
index d85ac7c807..551b25394a 100644
--- a/packages/backend/src/core/MfmService.ts
+++ b/packages/backend/src/core/MfmService.ts
@@ -15,7 +15,7 @@ import { intersperse } from '@/misc/prelude/array.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { bindThis } from '@/decorators.js';
-import type * as mfm from '@transfem-org/sfm-js';
+import type * as mfm from 'mfm-js';
 
 const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
 const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index a9f4083446..f8584a4a48 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -4,7 +4,7 @@
  */
 
 import { setImmediate } from 'node:timers/promises';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { In, DataSource, IsNull, LessThan } from 'typeorm';
 import * as Redis from 'ioredis';
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index a359381573..d963bf1945 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -4,7 +4,7 @@
  */
 
 import { setImmediate } from 'node:timers/promises';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { DataSource, In, IsNull, LessThan } from 'typeorm';
 import * as Redis from 'ioredis';
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
diff --git a/packages/backend/src/core/activitypub/ApMfmService.ts b/packages/backend/src/core/activitypub/ApMfmService.ts
index c4a948429a..ddb6461746 100644
--- a/packages/backend/src/core/activitypub/ApMfmService.ts
+++ b/packages/backend/src/core/activitypub/ApMfmService.ts
@@ -4,7 +4,7 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { MfmService, Appender } from '@/core/MfmService.js';
 import type { MiNote } from '@/models/Note.js';
 import { bindThis } from '@/decorators.js';
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 789611fd97..08a8f30049 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -6,7 +6,7 @@
 import { createPublicKey, randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { UnrecoverableError } from 'bullmq';
 import { Element, Text } from 'domhandler';
 import { DI } from '@/di-symbols.js';
diff --git a/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts b/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts
index 36a9b8e1f4..73ae9abb54 100644
--- a/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts
+++ b/packages/backend/src/misc/extract-custom-emojis-from-mfm.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { unique } from '@/misc/prelude/array.js';
 
 export function extractCustomEmojisFromMfm(nodes: mfm.MfmNode[]): string[] {
diff --git a/packages/backend/src/misc/extract-hashtags.ts b/packages/backend/src/misc/extract-hashtags.ts
index ed7606d995..d3d245d414 100644
--- a/packages/backend/src/misc/extract-hashtags.ts
+++ b/packages/backend/src/misc/extract-hashtags.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { unique } from '@/misc/prelude/array.js';
 
 export function extractHashtags(nodes: mfm.MfmNode[]): string[] {
diff --git a/packages/backend/src/misc/extract-mentions.ts b/packages/backend/src/misc/extract-mentions.ts
index bb21c32ffb..2ec9349718 100644
--- a/packages/backend/src/misc/extract-mentions.ts
+++ b/packages/backend/src/misc/extract-mentions.ts
@@ -5,7 +5,7 @@
 
 // test is located in test/extract-mentions
 
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 
 export function extractMentions(nodes: mfm.MfmNode[]): mfm.MfmMention['props'][] {
 	// TODO: 重複を削除
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index e632915f62..5767880531 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { Inject, Injectable } from '@nestjs/common';
 import ms from 'ms';
 import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
diff --git a/packages/backend/src/server/api/mastodon/MastodonConverters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
index 02ce31c4f8..df8d68042a 100644
--- a/packages/backend/src/server/api/mastodon/MastodonConverters.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Entity, MastodonEntity, MisskeyEntity } from 'megalodon';
-import mfm from '@transfem-org/sfm-js';
+import mfm from 'mfm-js';
 import { MastodonNotificationType } from 'megalodon/lib/src/mastodon/notification.js';
 import { NotificationType } from 'megalodon/lib/src/notification.js';
 import { DI } from '@/di-symbols.js';
diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts
index dcd4d80303..a622ae7e34 100644
--- a/packages/backend/src/server/web/FeedService.ts
+++ b/packages/backend/src/server/web/FeedService.ts
@@ -15,7 +15,7 @@ import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.j
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
 import { MfmService } from "@/core/MfmService.js";
-import { parse as mfmParse } from '@transfem-org/sfm-js';
+import { parse as mfmParse } from 'mfm-js';
 
 @Injectable()
 export class FeedService {
diff --git a/packages/backend/test/unit/MfmService.ts b/packages/backend/test/unit/MfmService.ts
index f96f3977d0..af1fc4e132 100644
--- a/packages/backend/test/unit/MfmService.ts
+++ b/packages/backend/test/unit/MfmService.ts
@@ -4,7 +4,7 @@
  */
 
 import * as assert from 'assert';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { Test } from '@nestjs/testing';
 
 import { CoreModule } from '@/core/CoreModule.js';
diff --git a/packages/backend/test/unit/extract-mentions.ts b/packages/backend/test/unit/extract-mentions.ts
index 2aad89d65b..3403387e30 100644
--- a/packages/backend/test/unit/extract-mentions.ts
+++ b/packages/backend/test/unit/extract-mentions.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 
-import { parse } from '@transfem-org/sfm-js';
+import { parse } from 'mfm-js';
 import { extractMentions } from '@/misc/extract-mentions.js';
 
 describe('Extract mentions', () => {
diff --git a/packages/frontend-embed/package.json b/packages/frontend-embed/package.json
index 5191fe6852..5b4774c7af 100644
--- a/packages/frontend-embed/package.json
+++ b/packages/frontend-embed/package.json
@@ -11,8 +11,8 @@
 	},
 	"dependencies": {
 		"@discordapp/twemoji": "15.1.0",
-		"@phosphor-icons/web": "^2.0.3",
-		"@transfem-org/sfm-js": "0.24.5",
+		"@phosphor-icons/web": "2.1.2",
+		"mfm-js": "npm:@transfem-org/sfm-js@0.24.6",
 		"buraha": "0.0.1",
 		"frontend-shared": "workspace:*",
 		"json5": "2.2.3",
diff --git a/packages/frontend-embed/src/components/EmMfm.ts b/packages/frontend-embed/src/components/EmMfm.ts
index d377d492e0..74ae3373ef 100644
--- a/packages/frontend-embed/src/components/EmMfm.ts
+++ b/packages/frontend-embed/src/components/EmMfm.ts
@@ -5,7 +5,7 @@
 
 import { h, provide } from 'vue';
 import type { VNode, SetupContext } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { host } from '@@/js/config.js';
 import EmUrl from '@/components/EmUrl.vue';
diff --git a/packages/frontend-embed/src/components/EmNote.vue b/packages/frontend-embed/src/components/EmNote.vue
index 666cbde72d..0dc77d09a7 100644
--- a/packages/frontend-embed/src/components/EmNote.vue
+++ b/packages/frontend-embed/src/components/EmNote.vue
@@ -105,7 +105,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, ref, shallowRef } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { shouldCollapsed } from '@@/js/collapsed.js';
 import { url } from '@@/js/config.js';
diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue
index 9f4be8c666..716a5fbf81 100644
--- a/packages/frontend-embed/src/components/EmNoteDetailed.vue
+++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue
@@ -128,7 +128,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, ref } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import I18n from '@/components/I18n.vue';
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index d04a04c78c..fd99ed2194 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -112,7 +112,7 @@
 		"@vue/compiler-core": "3.5.14",
 		"@vue/compiler-sfc": "3.5.14",
 		"@vue/runtime-core": "3.5.14",
-		"@transfem-org/sfm-js": "0.24.6",
+		"mfm-js": "npm:@transfem-org/sfm-js@0.24.6",
 		"acorn": "8.14.1",
 		"astring": "1.9.0",
 		"cross-env": "7.0.3",
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 37882ef5b9..ef9d4c68fa 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -180,7 +180,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, onMounted, ref, useTemplateRef, watch, provide } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import { shouldCollapsed } from '@@/js/collapsed.js';
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 3f692d4964..b941d776de 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -233,7 +233,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, onMounted, provide, ref, useTemplateRef, watch } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import * as config from '@@/js/config.js';
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 13ba5ff0ba..508ee2d655 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -107,7 +107,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { inject, watch, nextTick, onMounted, defineAsyncComponent, provide, shallowRef, ref, computed, useTemplateRef, toRaw } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import insertTextAtCursor from 'insert-text-at-cursor';
 import { toASCII } from 'punycode.js';
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue
index 0780f6c910..b7eddb9536 100644
--- a/packages/frontend/src/components/MkSubNoteContent.vue
+++ b/packages/frontend/src/components/MkSubNoteContent.vue
@@ -35,7 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { ref, computed, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import { shouldCollapsed } from '@@/js/collapsed.js';
 import MkMediaList from '@/components/MkMediaList.vue';
 import MkPoll from '@/components/MkPoll.vue';
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index 24293343ac..c554319c30 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -181,7 +181,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, onMounted, ref, useTemplateRef, watch, provide } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import { shouldCollapsed } from '@@/js/collapsed.js';
diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue
index 3c867a9559..f678c85431 100644
--- a/packages/frontend/src/components/SkNoteDetailed.vue
+++ b/packages/frontend/src/components/SkNoteDetailed.vue
@@ -238,7 +238,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, onMounted, onUnmounted, onUpdated, provide, ref, useTemplateRef, watch } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import * as config from '@@/js/config.js';
diff --git a/packages/frontend/src/components/SkOldNoteWindow.vue b/packages/frontend/src/components/SkOldNoteWindow.vue
index 39ad2bd7c2..aa1da2d6e3 100644
--- a/packages/frontend/src/components/SkOldNoteWindow.vue
+++ b/packages/frontend/src/components/SkOldNoteWindow.vue
@@ -76,7 +76,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { inject, onMounted, ref, shallowRef, computed } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import MkNoteSimple from '@/components/MkNoteSimple.vue';
 import MkMediaList from '@/components/MkMediaList.vue';
diff --git a/packages/frontend/src/components/global/MkMfm.ts b/packages/frontend/src/components/global/MkMfm.ts
index dea486e66d..9f92c43b68 100644
--- a/packages/frontend/src/components/global/MkMfm.ts
+++ b/packages/frontend/src/components/global/MkMfm.ts
@@ -4,7 +4,7 @@
  */
 
 import { h, defineAsyncComponent } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { host } from '@@/js/config.js';
 import CkFollowMouse from '../CkFollowMouse.vue';
diff --git a/packages/frontend/src/pages/chat/XMessage.vue b/packages/frontend/src/pages/chat/XMessage.vue
index 1536a91196..b72583214b 100644
--- a/packages/frontend/src/pages/chat/XMessage.vue
+++ b/packages/frontend/src/pages/chat/XMessage.vue
@@ -53,7 +53,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, provide } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { url } from '@@/js/config.js';
 import { isLink } from '@@/js/is-link.js';
diff --git a/packages/frontend/src/utility/check-animated-mfm.ts b/packages/frontend/src/utility/check-animated-mfm.ts
index 2614dfb4f1..371a631af7 100644
--- a/packages/frontend/src/utility/check-animated-mfm.ts
+++ b/packages/frontend/src/utility/check-animated-mfm.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 
 export function checkAnimationFromMfm(nodes: mfm.MfmNode[]): boolean {
 	const animatedNodes = mfm.extract(nodes, (node) => {
diff --git a/packages/frontend/src/utility/extract-mentions.ts b/packages/frontend/src/utility/extract-mentions.ts
index 89a5ce1df8..d518562053 100644
--- a/packages/frontend/src/utility/extract-mentions.ts
+++ b/packages/frontend/src/utility/extract-mentions.ts
@@ -5,7 +5,7 @@
 
 // test is located in test/extract-mentions
 
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 
 export function extractMentions(nodes: mfm.MfmNode[]): mfm.MfmMention['props'][] {
 	// TODO: 重複を削除
diff --git a/packages/frontend/src/utility/extract-preview-urls.ts b/packages/frontend/src/utility/extract-preview-urls.ts
index e3bd62c993..264359f179 100644
--- a/packages/frontend/src/utility/extract-preview-urls.ts
+++ b/packages/frontend/src/utility/extract-preview-urls.ts
@@ -4,7 +4,7 @@
  */
 
 import type * as Misskey from 'misskey-js';
-import type * as mfm from '@transfem-org/sfm-js';
+import type * as mfm from 'mfm-js';
 import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js';
 import { getNoteUrls } from '@/utility/getNoteUrls';
 
diff --git a/packages/frontend/src/utility/extract-url-from-mfm.ts b/packages/frontend/src/utility/extract-url-from-mfm.ts
index 260dba030e..99d80f3624 100644
--- a/packages/frontend/src/utility/extract-url-from-mfm.ts
+++ b/packages/frontend/src/utility/extract-url-from-mfm.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 
 // unique without hash
 // [ http://a/#1, http://a/#2, http://b/#3 ] => [ http://a/#1, http://b/#3 ]
-- 
cgit v1.2.3-freya


From b44abe0eaaeb85111d94046b182e03e67993a101 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 13 Jun 2025 23:18:06 -0400
Subject: set X-Robots-Tag to disable indexing API endpoints

---
 packages/backend/src/server/ActivityPubServerService.ts            | 4 ++++
 packages/backend/src/server/FileServerService.ts                   | 4 ++++
 packages/backend/src/server/api/ApiCallService.ts                  | 4 ++++
 .../backend/src/server/api/mastodon/MastodonApiServerService.ts    | 7 +++++++
 packages/backend/src/server/web/UrlPreviewService.ts               | 4 ++++
 5 files changed, 23 insertions(+)

(limited to 'packages/backend/src/server/web')

diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index 41beadb56d..a362308b17 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -791,6 +791,10 @@ export class ActivityPubServerService {
 			reply.header('Access-Control-Allow-Origin', '*');
 			reply.header('Access-Control-Expose-Headers', 'Vary');
 
+			// Tell crawlers not to index AP endpoints.
+			// https://developers.google.com/search/docs/crawling-indexing/block-indexing
+			reply.header('X-Robots-Tag', 'noindex');
+
 			/* tell any caching proxy that they should not cache these
 				 responses: we wouldn't want the proxy to return a 403 to
 				 someone presenting a valid signature, or return a cached
diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts
index 1a372cb789..0910c0d36b 100644
--- a/packages/backend/src/server/FileServerService.ts
+++ b/packages/backend/src/server/FileServerService.ts
@@ -70,6 +70,10 @@ export class FileServerService {
 		fastify.addHook('onRequest', (request, reply, done) => {
 			reply.header('Content-Security-Policy', 'default-src \'none\'; img-src \'self\'; media-src \'self\'; style-src \'unsafe-inline\'');
 			reply.header('Access-Control-Allow-Origin', '*');
+
+			// Tell crawlers not to index files endpoints.
+			// https://developers.google.com/search/docs/crawling-indexing/block-indexing
+			reply.header('X-Robots-Tag', 'noindex');
 			done();
 		});
 
diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts
index 6d6c86bb82..66d968224a 100644
--- a/packages/backend/src/server/api/ApiCallService.ts
+++ b/packages/backend/src/server/api/ApiCallService.ts
@@ -148,6 +148,10 @@ export class ApiCallService implements OnApplicationShutdown {
 		request: FastifyRequest<{ Body: Record<string, unknown> | undefined, Querystring: Record<string, unknown> }>,
 		reply: FastifyReply,
 	): void {
+		// Tell crawlers not to index API endpoints.
+		// https://developers.google.com/search/docs/crawling-indexing/block-indexing
+		reply.header('X-Robots-Tag', 'noindex');
+
 		const body = request.method === 'GET'
 			? request.query
 			: request.body;
diff --git a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
index 74fd9d7d59..072dacf708 100644
--- a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
@@ -71,6 +71,13 @@ export class MastodonApiServerService {
 			done();
 		});
 
+		// Tell crawlers not to index API endpoints.
+		// https://developers.google.com/search/docs/crawling-indexing/block-indexing
+		fastify.addHook('onRequest', (request, reply, done) => {
+			reply.header('X-Robots-Tag', 'noindex');
+			done();
+		});
+
 		// External endpoints
 		this.apiAccountMastodon.register(fastify);
 		this.apiAppsMastodon.register(fastify);
diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index ed5d87d15d..71a142fc6f 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -125,6 +125,10 @@ export class UrlPreviewService {
 		reply: FastifyReply,
 	): Promise<void> {
 		if (!this.meta.urlPreviewEnabled) {
+			// Tell crawlers not to index URL previews.
+			// https://developers.google.com/search/docs/crawling-indexing/block-indexing
+			reply.header('X-Robots-Tag', 'noindex');
+
 			return reply.code(403).send({
 				error: {
 					message: 'URL preview is disabled',
-- 
cgit v1.2.3-freya