add column mod_ban.instance_id

Author: Nutomic

crates/api/src/local_user/ban_person.rs

@@ -81,6 +81,7 @@ pub async fn ban_from_site(
     reason: data.reason.clone(),
     banned: Some(data.ban),
     expires,
+    instance_id: local_user_view.person.instance_id,
   };
 
   ModBan::create(&mut context.pool(), &form).await?;

crates/apub/src/activities/block/block_user.rs

@@ -159,26 +159,27 @@ impl ActivityHandler for BlockUser {
             ..Default::default()
           };
           Person::update(&mut context.pool(), blocked_person.id, &form).await?;
+
+          if self.remove_data.unwrap_or(false) {
+            // TODO: only remove content in communities belonging to that instance
+            remove_or_restore_user_data(mod_person.id, blocked_person.id, true, &reason, context)
+              .await?;
+          }
         } else {
           // user banned from remote instance, write to instance actions table and remove content
           // only in communities from that instance
           let form = InstanceBanForm::new(blocked_person.id, site.instance_id, expires);
           InstanceActions::ban(&mut context.pool(), &form).await?;
         }
 
-        if self.remove_data.unwrap_or(false) {
-          // TODO: only remove content in communities belonging to that instance
-          remove_or_restore_user_data(mod_person.id, blocked_person.id, true, &reason, context)
-            .await?;
-        }
-
         // write mod log
         let form = ModBanForm {
           mod_person_id: mod_person.id,
           other_person_id: blocked_person.id,
           reason,
           banned: Some(true),
           expires,
+          instance_id: site.instance_id,
         };
         ModBan::create(&mut context.pool(), &form).await?;
       }

crates/apub/src/activities/block/undo_block_user.rs

@@ -104,6 +104,10 @@ impl ActivityHandler for UndoBlockUser {
       SiteOrCommunity::Site(site) => {
         verify_is_public(&self.to, &self.cc)?;
         if blocked_person.instance_id == site.instance_id {
+          if self.restore_data.unwrap_or(false) {
+            remove_or_restore_user_data(mod_person.id, blocked_person.id, false, &None, context)
+              .await?;
+          }
           // user unbanned from home instance, write directly to person table
           let form = PersonUpdateForm {
             banned: Some(true),
@@ -117,18 +121,14 @@ impl ActivityHandler for UndoBlockUser {
           InstanceActions::unban(&mut context.pool(), &form).await?;
         }
 
-        if self.restore_data.unwrap_or(false) {
-          remove_or_restore_user_data(mod_person.id, blocked_person.id, false, &None, context)
-            .await?;
-        }
-
         // write mod log
         let form = ModBanForm {
           mod_person_id: mod_person.id,
           other_person_id: blocked_person.id,
           reason: self.object.summary,
           banned: Some(false),
           expires,
+          instance_id: site.instance_id,
         };
         ModBan::create(&mut context.pool(), &form).await?;
       }

crates/db_schema/src/schema.rs

@@ -574,6 +574,7 @@ diesel::table! {
         banned -> Bool,
         expires -> Nullable<Timestamptz>,
         published -> Timestamptz,
+        instance_id -> Int4,
     }
 }
 

crates/db_schema/src/source/mod_log/moderator.rs

@@ -16,6 +16,7 @@ use crate::{
   newtypes::{
     CommentId,
     CommunityId,
+    InstanceId,
     ModAddCommunityId,
     ModAddId,
     ModBanFromCommunityId,
@@ -210,6 +211,7 @@ pub struct ModBan {
   #[cfg_attr(feature = "full", ts(optional))]
   pub expires: Option<DateTime<Utc>>,
   pub published: DateTime<Utc>,
+  pub instance_id: InstanceId,
 }
 
 #[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
@@ -245,6 +247,7 @@ pub struct ModBanForm {
   pub reason: Option<String>,
   pub banned: Option<bool>,
   pub expires: Option<DateTime<Utc>>,
+  pub instance_id: InstanceId,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]

migrations/2025-03-17-110023_site_person_ban/down.sql

@@ -4,3 +4,6 @@ ALTER TABLE instance_actions
 ALTER TABLE instance_actions
     DROP COLUMN ban_expires;
 
+ALTER TABLE mod_ban
+    DROP COLUMN instance_id;
+

migrations/2025-03-17-110023_site_person_ban/up.sql

@@ -4,3 +4,7 @@ ALTER TABLE instance_actions
 ALTER TABLE instance_actions
     ADD COLUMN ban_expires timestamptz;
 
+-- TODO: could be not null
+ALTER TABLE mod_ban
+    ADD COLUMN instance_id int NOT NULL REFERENCES instance ON UPDATE CASCADE ON DELETE CASCADE;
+