add: mark instance as NSFW

Closes transfem-org/Sharkey#197

packages/backend/migration/1701809447000-NSFW-Instance.js

@@ -0,0 +1,11 @@
+export class NSFWInstance1701809447000 {
+    name = 'NSFWInstance1701809447000'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" ADD "isNSFW" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isNSFW"`);
+    }
+}

packages/backend/src/core/activitypub/models/ApImageService.ts

@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { DriveFilesRepository } from '@/models/_.js';
+import type { DriveFilesRepository, InstancesRepository } from '@/models/_.js';
 import type { MiRemoteUser } from '@/models/User.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import { MetaService } from '@/core/MetaService.js';
@@ -18,6 +18,7 @@ import { checkHttps } from '@/misc/check-https.js';
 import { ApResolverService } from '../ApResolverService.js';
 import { ApLoggerService } from '../ApLoggerService.js';
 import type { IObject } from '../type.js';
+import { UtilityService } from '@/core/UtilityService.js';
 
 @Injectable()
 export class ApImageService {
@@ -27,10 +28,14 @@ export class ApImageService {
 		@Inject(DI.driveFilesRepository)
 		private driveFilesRepository: DriveFilesRepository,
 
+		@Inject(DI.instancesRepository)
+		private instancesRepository: InstancesRepository,
+
 		private metaService: MetaService,
 		private apResolverService: ApResolverService,
 		private driveService: DriveService,
 		private apLoggerService: ApLoggerService,
+		private utilityService: UtilityService,
 	) {
 		this.logger = this.apLoggerService.logger;
 	}
@@ -68,6 +73,12 @@ export class ApImageService {
 		// 2. or the image is not sensitive
 		const shouldBeCached = instance.cacheRemoteFiles && (instance.cacheRemoteSensitiveFiles || !image.sensitive);
 
+		const shouldBeSensitive = await this.instancesRepository.findOneBy({ host: this.utilityService.toPuny(actor.host), isNSFW: true });
+
+		if (shouldBeSensitive) {
+			image.sensitive = true;
+		}
+
 		const file = await this.driveService.uploadFromUrl({
 			url: image.url,
 			user: actor,

packages/backend/src/core/entities/InstanceEntityService.ts

@@ -48,6 +48,7 @@ export class InstanceEntityService {
 			themeColor: instance.themeColor,
 			infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
 			latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
+			isNSFW: instance.isNSFW,
 		};
 	}
 

packages/backend/src/models/Instance.ts

@@ -144,4 +144,9 @@ export class MiInstance {
 		nullable: true,
 	})
 	public infoUpdatedAt: Date | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isNSFW: boolean;
 }

packages/backend/src/models/json-schema/federation-instance.ts

@@ -108,5 +108,10 @@ export const packedFederationInstanceSchema = {
 			optional: false, nullable: true,
 			format: 'date-time',
 		},
+		isNSFW: {
+			type: 'boolean',
+			optional: false,
+			nullable: false,
+		},
 	},
 } as const;

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

@@ -23,8 +23,9 @@ export const paramDef = {
 	properties: {
 		host: { type: 'string' },
 		isSuspended: { type: 'boolean' },
+		isNSFW: { type: 'boolean' },
 	},
-	required: ['host', 'isSuspended'],
+	required: ['host'],
 } as const;
 
 @Injectable()
@@ -44,23 +45,31 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('instance not found');
 			}
 
-			await this.federatedInstanceService.update(instance.id, {
-				isSuspended: ps.isSuspended,
-			});
+			if (ps.isSuspended != null) {
+				await this.federatedInstanceService.update(instance.id, {
+					isSuspended: ps.isSuspended,
+				});
 
-			if (instance.isSuspended !== ps.isSuspended) {
-				if (ps.isSuspended) {
-					this.moderationLogService.log(me, 'suspendRemoteInstance', {
-						id: instance.id,
-						host: instance.host,
-					});
-				} else {
-					this.moderationLogService.log(me, 'unsuspendRemoteInstance', {
-						id: instance.id,
-						host: instance.host,
-					});
+				if (instance.isSuspended !== ps.isSuspended) {
+					if (ps.isSuspended) {
+						this.moderationLogService.log(me, 'suspendRemoteInstance', {
+							id: instance.id,
+							host: instance.host,
+						});
+					} else {
+						this.moderationLogService.log(me, 'unsuspendRemoteInstance', {
+							id: instance.id,
+							host: instance.host,
+						});
+					}
 				}
 			}
+
+			if (ps.isNSFW != null) {
+				await this.federatedInstanceService.update(instance.id, {
+					isNSFW: ps.isNSFW,
+				});
+			}
 		});
 	}
 }

packages/backend/src/server/api/endpoints/federation/instances.ts

@@ -40,6 +40,7 @@ export const paramDef = {
 		federating: { type: 'boolean', nullable: true },
 		subscribing: { type: 'boolean', nullable: true },
 		publishing: { type: 'boolean', nullable: true },
+		nsfw: { type: 'boolean', nullable: true },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
 		offset: { type: 'integer', default: 0 },
 		sort: { type: 'string' },
@@ -103,6 +104,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				}
 			}
 
+			if (typeof ps.nsfw === 'boolean') {
+				if (ps.nsfw) {
+					query.andWhere('instance.isNSFW = TRUE');
+				} else {
+					query.andWhere('instance.isNSFW = FALSE');
+				}
+			}
+
 			if (typeof ps.silenced === "boolean") {
 				const meta = await this.metaService.fetch(true);
 

packages/frontend/src/pages/about.federation.vue

@@ -17,6 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="federating">{{ i18n.ts.federating }}</option>
 				<option value="subscribing">{{ i18n.ts.subscribing }}</option>
 				<option value="publishing">{{ i18n.ts.publishing }}</option>
+				<option value="nsfw">NSFW</option>
 				<option value="suspended">{{ i18n.ts.suspended }}</option>
 				<option value="silenced">{{ i18n.ts.silence }}</option>
 				<option value="blocked">{{ i18n.ts.blocked }}</option>
@@ -78,6 +79,7 @@ const pagination = {
 			state === 'blocked' ? { blocked: true } :
 			state === 'silenced' ? { silenced: true } :
 			state === 'notResponding' ? { notResponding: true } :
+			state === 'nsfw' ? { nsfw: true } :
 			{}),
 	})),
 } as Paging;
@@ -87,6 +89,7 @@ function getStatus(instance) {
 	if (instance.isBlocked) return 'Blocked';
 	if (instance.isSilenced) return 'Silenced';
 	if (instance.isNotResponding) return 'Error';
+	if (instance.isNSFW) return 'NSFW';
 	return 'Alive';
 }
 </script>

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

@@ -21,6 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<option value="federating">{{ i18n.ts.federating }}</option>
 							<option value="subscribing">{{ i18n.ts.subscribing }}</option>
 							<option value="publishing">{{ i18n.ts.publishing }}</option>
+							<option value="nsfw">NSFW</option>
 							<option value="suspended">{{ i18n.ts.suspended }}</option>
 							<option value="blocked">{{ i18n.ts.blocked }}</option>
 							<option value="silenced">{{ i18n.ts.silence }}</option>
@@ -86,6 +87,7 @@ const pagination = {
 			state === 'blocked' ? { blocked: true } :
 			state === 'silenced' ? { silenced: true } :
 			state === 'notResponding' ? { notResponding: true } :
+			state === 'nsfw' ? { nsfw: true } :
 			{}),
 	})),
 };
@@ -95,6 +97,7 @@ function getStatus(instance) {
 	if (instance.isBlocked) return 'Blocked';
 	if (instance.isSilenced) return 'Silenced';
 	if (instance.isNotResponding) return 'Error';
+	if (instance.isNSFW) return 'NSFW';
 	return 'Alive';
 }
 

packages/frontend/src/pages/instance-info.vue

@@ -37,6 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkSwitch v-model="suspended" :disabled="!instance" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</MkSwitch>
 					<MkSwitch v-model="isBlocked" :disabled="!meta || !instance" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</MkSwitch>
 					<MkSwitch v-model="isSilenced" :disabled="!meta || !instance" @update:modelValue="toggleSilenced">{{ i18n.ts.silenceThisInstance }}</MkSwitch>
+					<MkSwitch v-model="isNSFW" :disabled="!instance" @update:modelValue="toggleNSFW">Mark as NSFW</MkSwitch>
 					<MkButton @click="refreshMetadata"><i class="ph-arrows-counter-clockwise ph-bold ph-lg"></i> Refresh metadata</MkButton>
 				</div>
 			</FormSection>
@@ -149,6 +150,7 @@ let instance = $ref<Misskey.entities.Instance | null>(null);
 let suspended = $ref(false);
 let isBlocked = $ref(false);
 let isSilenced = $ref(false);
+let isNSFW = $ref(false);
 let faviconUrl = $ref<string | null>(null);
 
 const usersPagination = {
@@ -172,6 +174,7 @@ async function fetch(): Promise<void> {
 	suspended = instance.isSuspended;
 	isBlocked = instance.isBlocked;
 	isSilenced = instance.isSilenced;
+	isNSFW = instance.isNSFW;
 	faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview');
 }
 
@@ -201,6 +204,14 @@ async function toggleSuspend(): Promise<void> {
 	});
 }
 
+async function toggleNSFW(): Promise<void> {
+	if (!instance) throw new Error('No instance?');
+	await os.api('admin/federation/update-instance', {
+		host: instance.host,
+		isNSFW: isNSFW,
+	});
+}
+
 function refreshMetadata(): void {
 	if (!instance) throw new Error('No instance?');
 	os.api('admin/federation/refresh-remote-instance-metadata', {

packages/misskey-js/src/entities.ts

@@ -609,6 +609,7 @@ export type Instance = {
 	faviconUrl: string | null;
 	themeColor: string | null;
 	infoUpdatedAt: DateString | null;
+	isNSFW: boolean;
 };
 
 export type Signin = {