ローカルユーザーが誰もフォローしていないリモートユーザーによるノートのブロックの改善

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Unreleased
 
 ### General
+- 未知のリモートユーザからの通知を生成するノートをブロックする機能の改善 (#206)
 
 ### Client
 

packages/backend/migration/1719663422807-NirilaBlockMentionsFromUnfamiliarRemoteUsers.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: anatawa12
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class NirilaBlockMentionsFromUnfamiliarRemoteUsers1719663422807 {
+    name = 'NirilaBlockMentionsFromUnfamiliarRemoteUsers1719663422807'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "nirilaBlockMentionsFromUnfamiliarRemoteUsers" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "nirilaBlockMentionsFromUnfamiliarRemoteUsers"`);
+    }
+}

packages/backend/migration/1719664479666-NirilaAllowedUnfamiliarRemoteUserIds.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: anatawa12
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class NirilaAllowedUnfamiliarRemoteUserIds1719664479666 {
+    name = 'NirilaAllowedUnfamiliarRemoteUserIds1719664479666'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "nirilaAllowedUnfamiliarRemoteUserIds" character varying(32) array NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "nirilaAllowedUnfamiliarRemoteUserIds"`);
+    }
+}

packages/backend/src/config.ts

@@ -103,7 +103,6 @@ type Source = {
 		maxWebImageSize?: number;
 		withRepliesInHomeTL?: boolean;
 		withRepliesInUserList?: boolean;
-		blockMentionsFromUnfamiliarRemoteUsers?: boolean;
 	}
 };
 
@@ -191,7 +190,6 @@ export type Config = {
 		maxWebImageSize?: number;
 		withRepliesInHomeTL?: boolean,
 		withRepliesInUserList: boolean,
-		blockMentionsFromUnfamiliarRemoteUsers: boolean;
 	}
 };
 
@@ -237,7 +235,6 @@ export function loadConfig(): Config {
 		// to avoid merge conflict in the future, this is at top
 		nirila: Object.assign({
 			withRepliesInUserList: true,
-			blockMentionsFromUnfamiliarRemoteUsers: false,
 		}, config.nirila ?? {}),
 		version,
 		publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl,

packages/backend/src/core/NoteCreateService.ts

@@ -377,7 +377,27 @@
 			|| (data.visibility === 'specified' && data.visibleUsers?.some(u => u.host === null))
 			|| data.reply?.userHost === null || (this.isRenote(data) && this.isQuote(data) && data.renote?.userHost === null) || false;
 
-		if (this.config.nirila.blockMentionsFromUnfamiliarRemoteUsers && user.host !== null && willCauseNotification) {
+		const isAllowedToCreateNotification = () => {
+			const targetUserIds: string[][] = [];
+			targetUserIds.push(mentionedUsers.filter(x => x.host == null).map(x => x.id))
+			if (data.visibility === 'specified' && data.visibleUsers != null)
+				targetUserIds.push(data.visibleUsers.filter(x => x.host == null).map(x => x.id));
+			if (data.reply != null && data.reply.userHost == null)
+				targetUserIds.push([data.reply.userId]);
+			if (this.isRenote(data) && this.isQuote(data) && data.renote.userHost === null)
+				targetUserIds.push([data.renote.userId]);
+			const allowedIds = new Set(meta.nirilaAllowedUnfamiliarRemoteUserIds);
+			for (let targetUserIds1 of targetUserIds) {
+				for (let targetUserId of targetUserIds1) {
+					if (allowedIds.has(targetUserId)) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		if (meta.nirilaBlockMentionsFromUnfamiliarRemoteUsers && user.host !== null && willCauseNotification && !isAllowedToCreateNotification()) {
 			const userEntity = await this.usersRepository.findOneBy({ id: user.id });
 			if ((userEntity?.followersCount ?? 0) === 0) {
 				this.logger.error('Request rejected because user has no local followers', { user: user.id, note: data });

packages/backend/src/models/Meta.ts

@@ -625,4 +625,16 @@ export class MiMeta {
 		nullable: true,
 	})
 	public urlPreviewUserAgent: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public nirilaBlockMentionsFromUnfamiliarRemoteUsers: boolean;
+
+	@Column('varchar', {
+		length: 32,
+		array: true,
+		default: '{}',
+	})
+	public nirilaAllowedUnfamiliarRemoteUserIds: string[];
 }

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -481,6 +481,20 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
+			nirilaBlockMentionsFromUnfamiliarRemoteUsers: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			nirilaAllowedUnfamiliarRemoteUserIds: {
+				type: 'array',
+				optional: false,
+				nullable: false,
+				items: {
+					type: 'string',
+					optional: false,
+					nullable: false,
+				},
+			},
 		},
 	},
 } as const;
@@ -615,6 +629,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				urlPreviewRequireContentLength: instance.urlPreviewRequireContentLength,
 				urlPreviewUserAgent: instance.urlPreviewUserAgent,
 				urlPreviewSummaryProxyUrl: instance.urlPreviewSummaryProxyUrl,
+				nirilaBlockMentionsFromUnfamiliarRemoteUsers: instance.nirilaBlockMentionsFromUnfamiliarRemoteUsers,
+				nirilaAllowedUnfamiliarRemoteUserIds: instance.nirilaAllowedUnfamiliarRemoteUserIds,
 			};
 		});
 	}

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -161,6 +161,15 @@ export const paramDef = {
 		urlPreviewRequireContentLength: { type: 'boolean' },
 		urlPreviewUserAgent: { type: 'string', nullable: true },
 		urlPreviewSummaryProxyUrl: { type: 'string', nullable: true },
+		nirilaBlockMentionsFromUnfamiliarRemoteUsers: { type: 'boolean', nullable: false },
+		nirilaAllowedUnfamiliarRemoteUserIds: {
+			type: 'array',
+			nullable: false,
+			items: {
+				type: 'string',
+				nullable: false,
+			},
+		}
 	},
 	required: [],
 } as const;
@@ -622,6 +631,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.urlPreviewSummaryProxyUrl = value === '' ? null : value;
 			}
 
+			if (ps.nirilaBlockMentionsFromUnfamiliarRemoteUsers !== undefined) {
+				set.nirilaBlockMentionsFromUnfamiliarRemoteUsers = ps.nirilaBlockMentionsFromUnfamiliarRemoteUsers;
+			}
+
+			if (ps.nirilaAllowedUnfamiliarRemoteUserIds !== undefined) {
+				set.nirilaAllowedUnfamiliarRemoteUserIds = ps.nirilaAllowedUnfamiliarRemoteUserIds;
+			}
+
 			const before = await this.metaService.fetch(true);
 
 			await this.metaService.update(set);

packages/frontend/src/pages/admin/moderation.vue

@@ -55,6 +55,15 @@
 						<template #label>{{ i18n.ts.hiddenTags }}</template>
 						<template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
 					</MkTextarea>
+
+					<MkSwitch v-model="nirilaBlockMentionsFromUnfamiliarRemoteUsers">
+						<template #label>未知のリモートユーザからの通知を生成するノートをブロックする</template>
+					</MkSwitch>
+
+					<MkTextarea v-model="hiddenTags">
+						<template #label>未知のリモートユーザからの通知を許可するローカルユーザのid</template>
+						<template #caption>9grmcrkrslのようなユーザのidであって@adminのようなユーザ名ではないことに気をつけてください。</template>
+					</MkTextarea>
 				</div>
 			</FormSuspense>
 		</MkSpacer>
@@ -93,6 +102,8 @@
 const tosUrl = ref<string | null>(null);
 const privacyPolicyUrl = ref<string | null>(null);
 const inquiryUrl = ref<string | null>(null);
+const nirilaBlockMentionsFromUnfamiliarRemoteUsers = ref<boolean>(false);
+const nirilaAllowedUnfamiliarRemoteUserIds = ref<string>('');
 
 async function init() {
 	const meta = await misskeyApi('admin/meta');
@@ -105,6 +116,8 @@
 	tosUrl.value = meta.tosUrl;
 	privacyPolicyUrl.value = meta.privacyPolicyUrl;
 	inquiryUrl.value = meta.inquiryUrl;
+	nirilaBlockMentionsFromUnfamiliarRemoteUsers.value = meta.nirilaBlockMentionsFromUnfamiliarRemoteUsers;
+	nirilaAllowedUnfamiliarRemoteUserIds.value = meta.nirilaAllowedUnfamiliarRemoteUserIds.join('\n');
 }
 
 function save() {
@@ -118,6 +131,9 @@
 		prohibitedWords: prohibitedWords.value.split('\n'),
 		hiddenTags: hiddenTags.value.split('\n'),
 		preservedUsernames: preservedUsernames.value.split('\n'),
+		nirilaBlockMentionsFromUnfamiliarRemoteUsers: nirilaBlockMentionsFromUnfamiliarRemoteUsers.value,
+		nirilaAllowedUnfamiliarRemoteUserIds: nirilaAllowedUnfamiliarRemoteUserIds.value == ''
+			? [] : nirilaAllowedUnfamiliarRemoteUserIds.value.split('\n'),
 	}).then(() => {
 		fetchInstance(true);
 	});

packages/misskey-js/src/autogen/types.ts

@@ -5100,6 +5100,8 @@ export type operations = {
             urlPreviewRequireContentLength: boolean;
             urlPreviewUserAgent: string | null;
             urlPreviewSummaryProxyUrl: string | null;
+            nirilaBlockMentionsFromUnfamiliarRemoteUsers: boolean;
+            nirilaAllowedUnfamiliarRemoteUserIds: string[];
           };
         };
       };
@@ -9110,6 +9112,8 @@ export type operations = {
           urlPreviewRequireContentLength?: boolean;
           urlPreviewUserAgent?: string | null;
           urlPreviewSummaryProxyUrl?: string | null;
+          nirilaBlockMentionsFromUnfamiliarRemoteUsers?: boolean;
+          nirilaAllowedUnfamiliarRemoteUserIds?: string[];
         };
       };
     };