Community local removed (#5500)

* Better handling of local and remote bans (fixes #3399, ref #4571)

* rename migration

* basic code changes

* post/community pending

* revert person.local_banned

* ignore local_removed communities in queries

* fix test

* Add column `community.local_removed`

* fmt

crates/db_schema/src/impls/community.rs

@@ -671,6 +671,7 @@ mod tests {
       report_count: 0,
       unresolved_report_count: 0,
       interactions_month: 0,
+      local_removed: false,
     };
 
     let community_follower_form = CommunityFollowerForm::new(

crates/db_schema/src/schema.rs

@@ -1,45 +1,45 @@
 // @generated automatically by Diesel CLI.
 
 pub mod sql_types {
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "actor_type_enum"))]
-    pub struct ActorTypeEnum;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "actor_type_enum"))]
+  pub struct ActorTypeEnum;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "comment_sort_type_enum"))]
-    pub struct CommentSortTypeEnum;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "comment_sort_type_enum"))]
+  pub struct CommentSortTypeEnum;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "community_follower_state"))]
-    pub struct CommunityFollowerState;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "community_follower_state"))]
+  pub struct CommunityFollowerState;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "community_visibility"))]
-    pub struct CommunityVisibility;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "community_visibility"))]
+  pub struct CommunityVisibility;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "federation_mode_enum"))]
-    pub struct FederationModeEnum;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "federation_mode_enum"))]
+  pub struct FederationModeEnum;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "listing_type_enum"))]
-    pub struct ListingTypeEnum;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "listing_type_enum"))]
+  pub struct ListingTypeEnum;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "ltree"))]
-    pub struct Ltree;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "ltree"))]
+  pub struct Ltree;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "post_listing_mode_enum"))]
-    pub struct PostListingModeEnum;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "post_listing_mode_enum"))]
+  pub struct PostListingModeEnum;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "post_sort_type_enum"))]
-    pub struct PostSortTypeEnum;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "post_sort_type_enum"))]
+  pub struct PostSortTypeEnum;
 
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "registration_mode_enum"))]
-    pub struct RegistrationModeEnum;
+  #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+  #[diesel(postgres_type(name = "registration_mode_enum"))]
+  pub struct RegistrationModeEnum;
 }
 
 diesel::table! {
@@ -226,6 +226,7 @@ diesel::table! {
         report_count -> Int2,
         unresolved_report_count -> Int2,
         interactions_month -> Int8,
+        local_removed -> Bool,
     }
 }
 

crates/db_schema/src/source/community.rs

@@ -93,6 +93,7 @@ pub struct Community {
   /// Number of any interactions over the last month.
   #[serde(skip)]
   pub interactions_month: i64,
+  pub local_removed: bool,
 }
 
 #[derive(Debug, Clone, derive_new::new)]
@@ -141,6 +142,8 @@ pub struct CommunityInsertForm {
   pub visibility: Option<CommunityVisibility>,
   #[new(default)]
   pub description: Option<String>,
+  #[new(default)]
+  pub local_removed: Option<bool>,
 }
 
 #[derive(Debug, Clone, Default)]
@@ -168,6 +171,7 @@ pub struct CommunityUpdateForm {
   pub posting_restricted_to_mods: Option<bool>,
   pub visibility: Option<CommunityVisibility>,
   pub description: Option<Option<String>>,
+  pub local_removed: Option<bool>,
 }
 
 #[skip_serializing_none]

crates/db_views/src/combined/search_combined_view.rs

@@ -90,6 +90,7 @@ impl SearchCombinedViewInternal {
         .eq(community::id.nullable())
         .or(post::community_id.eq(community::id))
         .and(not(community::removed))
+        .and(not(community::local_removed))
         .and(not(community::deleted)),
     );
 

crates/db_views/src/community/community_follower_view.rs

@@ -96,6 +96,7 @@ impl CommunityFollowerView {
       .filter(community_actions::person_id.eq(person_id))
       .filter(community::deleted.eq(false))
       .filter(community::removed.eq(false))
+      .filter(community::local_removed.eq(false))
       .select(Self::as_select())
       .order_by(community::title)
       .load::<CommunityFollowerView>(conn)

crates/db_views/src/community/community_moderator_view.rs

@@ -91,7 +91,9 @@ impl CommunityModeratorView {
 
     // Show removed communities to admins only
     if !local_user.is_admin() {
-      query = query.filter(community::removed.eq(false))
+      query = query
+        .filter(community::removed.eq(false))
+        .filter(community::local_removed.eq(false));
     }
 
     query.load::<Self>(conn).await

crates/db_views/src/post/post_view.rs

@@ -362,6 +362,7 @@ impl<'a> PostQuery<'a> {
     if !(o.creator_id.is_some() && o.local_user.is_admin()) {
       query = query
         .filter(community::removed.eq(false))
+        .filter(community::local_removed.eq(false))
         .filter(post::removed.eq(false));
     }
     if let Some(community_id) = o.community_id {

migrations/2025-03-13-112516_community-local-removed/down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE community
+    DROP COLUMN local_removed;
+

migrations/2025-03-13-112516_community-local-removed/up.sql

@@ -0,0 +1,5 @@
+-- Same for remote community, local removal should not be overwritten by
+-- remove+restore on home instance
+ALTER TABLE community
+    ADD COLUMN local_removed boolean NOT NULL DEFAULT FALSE;
+