Add new setting to block NSFW content

api_tests/package.json

@@ -29,7 +29,7 @@
     "eslint": "^9.20.0",
     "eslint-plugin-prettier": "^5.2.3",
     "jest": "^29.5.0",
-    "lemmy-js-client": "0.20.0-show-mod-reports.2",
+    "lemmy-js-client": "1.0.0-block-nsfw.1",
     "prettier": "^3.5.0",
     "ts-jest": "^29.1.0",
     "tsoa": "^6.6.0",

api_tests/src/post.spec.ts

@@ -45,6 +45,7 @@ import { AdminBlockInstanceParams } from "lemmy-js-client/dist/types/AdminBlockI
 import {
   AddModToCommunity,
   EditSite,
+  EditPost,
   PersonPostMentionView,
   PostReport,
   PostReportView,
@@ -921,6 +922,47 @@ test("Rewrite markdown links", async () => {
   );
 });
 
+test("Don't allow NSFW posts on instances that disable it", async () => {
+  // Disallow NSFW on gamma
+  let editSiteForm: EditSite = {
+    disallow_nsfw_content: true,
+  };
+  await gamma.editSite(editSiteForm);
+
+  if (!betaCommunity) {
+    throw "Missing beta community";
+  }
+
+  // Make a NSFW post
+  let postRes = await createPost(beta, betaCommunity.community.id);
+  let form: EditPost = {
+    nsfw: true,
+    post_id: postRes.post_view.post.id,
+  };
+  let updatePost = await beta.editPost(form);
+
+  // Gamma reject resolving the post
+  await expect(
+    resolvePost(gamma, updatePost.post_view.post),
+  ).rejects.toStrictEqual(Error("not_found"));
+
+  // Local users can't create NSFW post on Gamma
+  let gammaCommunity = (
+    await resolveCommunity(gamma, betaCommunity.community.ap_id)
+  ).community?.community;
+  if (!gammaCommunity) {
+    throw "Missing gamma community";
+  }
+  let gammaPost = await createPost(gamma, gammaCommunity.id);
+  let form2: EditPost = {
+    nsfw: true,
+    post_id: gammaPost.post_view.post.id,
+  };
+  await expect(gamma.editPost(form2)).rejects.toStrictEqual(
+    Error("nsfw_not_allowed"),
+  );
+});
+
 function checkPostReportName(rcv: ReportCombinedView, report: PostReport) {
   switch (rcv.type_) {
     case "Post":

crates/api_common/src/site.rs

@@ -254,6 +254,8 @@ pub struct CreateSite {
   pub comment_downvotes: Option<FederationMode>,
   #[cfg_attr(feature = "full", ts(optional))]
   pub disable_donation_dialog: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub disallow_nsfw_content: Option<bool>,
 }
 
 #[skip_serializing_none]
@@ -388,6 +390,9 @@ pub struct EditSite {
   /// donations.
   #[cfg_attr(feature = "full", ts(optional))]
   pub disable_donation_dialog: Option<bool>,
+  /// Block NSFW content being created
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub disallow_nsfw_content: Option<bool>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]

crates/api_common/src/utils.rs

@@ -652,6 +652,17 @@ pub fn check_private_instance_and_federation_enabled(local_site: &LocalSite) ->
   }
 }
 
+pub fn check_nsfw_allowed(nsfw: Option<bool>, local_site: Option<&LocalSite>) -> LemmyResult<()> {
+  let is_nsfw = nsfw.is_some_and(|nsfw| nsfw);
+  let nsfw_disallowed = local_site.is_some_and(|s| s.disallow_nsfw_content);
+
+  if nsfw_disallowed && is_nsfw {
+    Err(LemmyErrorType::NsfwNotAllowed)?
+  }
+
+  Ok(())
+}
+
 /// Read the site for an ap_id.
 ///
 /// Used for GetCommunityResponse and GetPersonDetails

crates/api_crud/src/community/create.rs

@@ -6,6 +6,7 @@ use lemmy_api_common::{
   community::{CommunityResponse, CreateCommunity},
   context::LemmyContext,
   utils::{
+    check_nsfw_allowed,
     generate_followers_url,
     generate_inbox_url,
     get_url_blocklist,
@@ -54,6 +55,7 @@ pub async fn create_community(
     Err(LemmyErrorType::OnlyAdminsCanCreateCommunities)?
   }
 
+  check_nsfw_allowed(data.nsfw, Some(&local_site))?;
   let slur_regex = local_site_to_slur_regex(&local_site);
   let url_blocklist = get_url_blocklist(&context).await?;
   check_slurs(&data.name, &slur_regex)?;

crates/api_crud/src/community/update.rs

@@ -9,6 +9,7 @@ use lemmy_api_common::{
   send_activity::{ActivityChannel, SendActivityData},
   utils::{
     check_community_mod_action,
+    check_nsfw_allowed,
     get_url_blocklist,
     local_site_to_slur_regex,
     process_markdown_opt,
@@ -36,6 +37,7 @@ pub async fn update_community(
 ) -> LemmyResult<Json<CommunityResponse>> {
   let local_site = LocalSite::read(&mut context.pool()).await?;
 
+  check_nsfw_allowed(data.nsfw, Some(&local_site))?;
   let slur_regex = local_site_to_slur_regex(&local_site);
   let url_blocklist = get_url_blocklist(&context).await?;
   check_slurs_opt(&data.title, &slur_regex)?;

crates/api_crud/src/post/create.rs

@@ -9,6 +9,7 @@ use lemmy_api_common::{
   send_activity::SendActivityData,
   utils::{
     check_community_user_action,
+    check_nsfw_allowed,
     get_url_blocklist,
     honeypot_check,
     local_site_to_slur_regex,
@@ -52,6 +53,7 @@ pub async fn create_post(
 
   honeypot_check(&data.honeypot)?;
 
+  check_nsfw_allowed(data.nsfw, Some(&local_site))?;
   let slur_regex = local_site_to_slur_regex(&local_site);
   check_slurs(&data.name, &slur_regex)?;
   let url_blocklist = get_url_blocklist(&context).await?;

crates/api_crud/src/post/update.rs

@@ -10,6 +10,7 @@ use lemmy_api_common::{
   send_activity::SendActivityData,
   utils::{
     check_community_user_action,
+    check_nsfw_allowed,
     get_url_blocklist,
     local_site_to_slur_regex,
     process_markdown_opt,
@@ -65,6 +66,8 @@ pub async fn update_post(
       .as_deref(),
   );
 
+  check_nsfw_allowed(data.nsfw, Some(&local_site))?;
+
   let alt_text = diesel_string_update(data.alt_text.as_deref());
 
   if let Some(name) = &data.name {

crates/api_crud/src/site/create.rs

@@ -105,6 +105,7 @@ pub async fn create_site(
     comment_upvotes: data.comment_upvotes,
     comment_downvotes: data.comment_downvotes,
     disable_donation_dialog: data.disable_donation_dialog,
+    disallow_nsfw_content: data.disallow_nsfw_content,
     ..Default::default()
   };
 

crates/api_crud/src/site/update.rs

@@ -114,6 +114,7 @@ pub async fn update_site(
     comment_upvotes: data.comment_upvotes,
     comment_downvotes: data.comment_downvotes,
     disable_donation_dialog: data.disable_donation_dialog,
+    disallow_nsfw_content: data.disallow_nsfw_content,
     ..Default::default()
   };
 

crates/apub/src/objects/community.rs

@@ -18,6 +18,7 @@ use chrono::{DateTime, Utc};
 use lemmy_api_common::{
   context::LemmyContext,
   utils::{
+    check_nsfw_allowed,
     generate_featured_url,
     generate_moderators_url,
     generate_outbox_url,
@@ -150,6 +151,21 @@ impl Object for ApubCommunity {
     } else {
       CommunityVisibility::Public
     });
+
+    // If NSFW is not allowed, reject new communities marked NSFW and
+    // remove communities that update to be NSFW
+    let block_for_nsfw = check_nsfw_allowed(group.sensitive, local_site.as_ref());
+    let removed = if let Err(e) = block_for_nsfw {
+      let c = ApubCommunity::read_from_id(group.id.inner().clone(), context).await?;
+      if c.is_some() {
+        Some(true)
+      } else {
+        Err(e)?
+      }
+    } else {
+      None
+    };
+
     let form = CommunityInsertForm {
       published: group.published,
       updated: group.updated,
@@ -161,6 +177,7 @@ impl Object for ApubCommunity {
       icon,
       banner,
       sidebar,
+      removed,
       description: group.summary,
       followers_url: group.followers.clone().map(Into::into),
       inbox_url: Some(

crates/apub/src/objects/post.rs

@@ -27,8 +27,13 @@ use chrono::{DateTime, Utc};
 use html2text::{from_read_with_decorator, render::TrivialDecorator};
 use lemmy_api_common::{
   context::LemmyContext,
-  request::generate_post_link_metadata,
-  utils::{get_url_blocklist, local_site_opt_to_slur_regex, process_markdown_opt},
+  request::{generate_post_link_metadata, purge_image_from_pictrs},
+  utils::{
+    check_nsfw_allowed,
+    get_url_blocklist,
+    local_site_opt_to_slur_regex,
+    process_markdown_opt,
+  },
 };
 use lemmy_db_schema::{
   source::{
@@ -225,6 +230,23 @@ impl Object for ApubPost {
       None
     };
 
+    // If NSFW is not allowed, reject NSFW posts and delete existing
+    // posts that get updated to be NSFW
+    let block_for_nsfw = check_nsfw_allowed(page.sensitive, local_site.as_ref());
+    if block_for_nsfw.is_err() {
+      let post = ApubPost::read_from_id(page.id.inner().clone(), context).await?;
+      if let Some(post) = post {
+        if let Some(url) = &post.url {
+          purge_image_from_pictrs(url, context).await.ok();
+        }
+        if let Some(thumbnail_url) = &post.thumbnail_url {
+          purge_image_from_pictrs(thumbnail_url, context).await.ok();
+        }
+        ApubPost::delete(post, context).await?;
+      }
+      block_for_nsfw?
+    }
+
     let url_blocklist = get_url_blocklist(context).await?;
 
     let url = if let Some(url) = url {

crates/db_schema/Cargo.toml

@@ -55,6 +55,7 @@ diesel = { workspace = true, features = [
   "postgres",
   "serde_json",
   "uuid",
+  "64-column-tables",
 ], optional = true }
 diesel-derive-newtype = { workspace = true, optional = true }
 diesel-derive-enum = { workspace = true, optional = true }

crates/db_schema/src/schema.rs

@@ -449,6 +449,7 @@ diesel::table! {
         comment_downvotes -> FederationModeEnum,
         disable_donation_dialog -> Bool,
         default_post_time_range_seconds -> Nullable<Int4>,
+        disallow_nsfw_content -> Bool,
     }
 }
 

crates/db_schema/src/source/local_site.rs

@@ -89,6 +89,8 @@ pub struct LocalSite {
   #[cfg_attr(feature = "full", ts(optional))]
   /// A default time range limit to apply to post sorts, in seconds.
   pub default_post_time_range_seconds: Option<i32>,
+  /// Block NSFW content being created
+  pub disallow_nsfw_content: bool,
 }
 
 #[derive(Clone, derive_new::new)]
@@ -152,6 +154,8 @@ pub struct LocalSiteInsertForm {
   pub disable_donation_dialog: Option<bool>,
   #[new(default)]
   pub default_post_time_range_seconds: Option<Option<i32>>,
+  #[new(default)]
+  pub disallow_nsfw_content: bool,
 }
 
 #[derive(Clone, Default)]
@@ -187,4 +191,5 @@ pub struct LocalSiteUpdateForm {
   pub comment_downvotes: Option<FederationMode>,
   pub disable_donation_dialog: Option<bool>,
   pub default_post_time_range_seconds: Option<Option<i32>>,
+  pub disallow_nsfw_content: Option<bool>,
 }

crates/utils/src/error.rs

@@ -58,6 +58,7 @@ pub enum LemmyErrorType {
   LanguageNotAllowed,
   CouldntUpdatePost,
   NoPostEditAllowed,
+  NsfwNotAllowed,
   EditPrivateMessageNotAllowed,
   SiteAlreadyExists,
   ApplicationQuestionRequired,

migrations/2025-02-18-143408_block_nsfw/down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE local_site
+    DROP COLUMN disallow_nsfw_content;
+

migrations/2025-02-18-143408_block_nsfw/up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE local_site
+    ADD COLUMN disallow_nsfw_content boolean DEFAULT FALSE NOT NULL;
+