replace "Mark instance as NSFW" toggle with an instance-level mandatory CW

packages/backend/src/core/NoteCreateService.ts

@@ -414,14 +414,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 		}
 
-		if (user.host && !data.cw) {
-			await this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
-				if (i.isNSFW && !this.isPureRenote(data)) {
-					data.cw = 'Instance is marked as NSFW';
-				}
-			});
-		}
-
 		if (mentionedUsers.length > 0 && mentionedUsers.length > (await this.roleService.getUserPolicies(user.id)).mentionLimit) {
 			throw new IdentifiableError('9f466dab-c856-48cd-9e65-ff90ff750580', 'Note contains too many mentions');
 		}

packages/backend/src/core/NoteEditService.ts

@@ -443,14 +443,6 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 		}
 
-		if (user.host && !data.cw) {
-			await this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
-				if (i.isNSFW && !this.noteCreateService.isPureRenote(data)) {
-					data.cw = 'Instance is marked as NSFW';
-				}
-			});
-		}
-
 		if (mentionedUsers.length > 0 && mentionedUsers.length > (await this.roleService.getUserPolicies(user.id)).mentionLimit) {
 			throw new IdentifiableError('9f466dab-c856-48cd-9e65-ff90ff750580', 'Note contains too many mentions');
 		}

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

@@ -75,7 +75,7 @@ export class ApImageService {
 		const shouldBeCached = this.meta.cacheRemoteFiles && (this.meta.cacheRemoteSensitiveFiles || !image.sensitive);
 
 		await this.federatedInstanceService.fetchOrRegister(actor.host).then(async i => {
-			if (i.isNSFW) {
+			if (i.isMediaSilenced) {
 				image.sensitive = true;
 			}
 		});

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

@@ -63,7 +63,6 @@ export class InstanceEntityService {
 			themeColor: instance.themeColor,
 			infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
 			latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
-			isNSFW: instance.isNSFW,
 			rejectReports: instance.rejectReports,
 			rejectQuotes: instance.rejectQuotes,
 			moderationNote: iAmModerator ? instance.moderationNote : null,

packages/backend/src/models/Instance.ts

@@ -205,11 +205,6 @@ export class MiInstance {
 	})
 	public infoUpdatedAt: Date | null;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public isNSFW: boolean;
-
 	@Column('boolean', {
 		default: false,
 	})

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

@@ -116,11 +116,6 @@ export const packedFederationInstanceSchema = {
 			optional: false, nullable: true,
 			format: 'date-time',
 		},
-		isNSFW: {
-			type: 'boolean',
-			optional: false,
-			nullable: false,
-		},
 		rejectReports: {
 			type: 'boolean',
 			optional: false,

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

@@ -24,7 +24,6 @@ export const paramDef = {
 	properties: {
 		host: { type: 'string' },
 		isSuspended: { type: 'boolean' },
-		isNSFW: { type: 'boolean' },
 		rejectReports: { type: 'boolean' },
 		moderationNote: { type: 'string' },
 		rejectQuotes: { type: 'boolean' },
@@ -58,7 +57,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			await this.federatedInstanceService.update(instance.id, {
 				suspensionState,
-				isNSFW: ps.isNSFW,
 				rejectReports: ps.rejectReports,
 				rejectQuotes: ps.rejectQuotes,
 				moderationNote: ps.moderationNote,
@@ -78,14 +76,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				}
 			}
 
-			if (ps.isNSFW != null && instance.isNSFW !== ps.isNSFW) {
-				const message = ps.rejectReports ? 'setRemoteInstanceNSFW' : 'unsetRemoteInstanceNSFW';
-				this.moderationLogService.log(me, message, {
-					id: instance.id,
-					host: instance.host,
-				});
-			}
-
 			if (ps.rejectReports != null && instance.rejectReports !== ps.rejectReports) {
 				const message = ps.rejectReports ? 'rejectRemoteInstanceReports' : 'acceptRemoteInstanceReports';
 				this.moderationLogService.log(me, message, {

packages/backend/src/types.ts

@@ -108,8 +108,6 @@ export const moderationLogTypes = [
 	'setMandatoryCW',
 	'setMandatoryCWForNote',
 	'setMandatoryCWForInstance',
-	'setRemoteInstanceNSFW',
-	'unsetRemoteInstanceNSFW',
 	'suspendRemoteInstance',
 	'unsuspendRemoteInstance',
 	'rejectRemoteInstanceReports',
@@ -309,14 +307,6 @@ export type ModerationLogPayloads = {
 		oldCW: string | null;
 		host: string;
 	};
-	setRemoteInstanceNSFW: {
-		id: string;
-		host: string;
-	};
-	unsetRemoteInstanceNSFW: {
-		id: string;
-		host: string;
-	};
 	suspendRemoteInstance: {
 		id: string;
 		host: string;