Receive and store remote site bans (fixes #3399)

crates/api/src/comment/distinguish.rs

@@ -24,7 +24,7 @@ pub async fn distinguish_comment(
   .await?;
 
   check_community_user_action(
-    &local_user_view.person,
+    &local_user_view,
     &orig_comment.community,
     &mut context.pool(),
   )
@@ -37,7 +37,7 @@ pub async fn distinguish_comment(
 
   // Verify that only a mod or admin can distinguish a comment
   check_community_mod_action(
-    &local_user_view.person,
+    &local_user_view,
     &orig_comment.community,
     false,
     &mut context.pool(),

crates/api/src/comment/like.rs

@@ -48,7 +48,7 @@ pub async fn like_comment(
   .await?;
 
   check_community_user_action(
-    &local_user_view.person,
+    &local_user_view,
     &orig_comment.community,
     &mut context.pool(),
   )

crates/api/src/comment/list_comment_likes.rs

@@ -22,7 +22,7 @@ pub async fn list_comment_likes(
 
   is_mod_or_admin(
     &mut context.pool(),
-    &local_user_view.person,
+    &local_user_view,
     comment_view.community.id,
   )
   .await?;

crates/api/src/community/add_mod.rs

@@ -24,13 +24,7 @@ pub async fn add_mod_to_community(
 ) -> LemmyResult<Json<AddModToCommunityResponse>> {
   let community = Community::read(&mut context.pool(), data.community_id).await?;
   // Verify that only mods or admins can add mod
-  check_community_mod_action(
-    &local_user_view.person,
-    &community,
-    false,
-    &mut context.pool(),
-  )
-  .await?;
+  check_community_mod_action(&local_user_view, &community, false, &mut context.pool()).await?;
 
   // If its a mod removal, also check that you're a higher mod.
   if !data.added {

crates/api/src/community/ban.rs

@@ -31,13 +31,7 @@ pub async fn ban_from_community(
   let community = Community::read(&mut context.pool(), data.community_id).await?;
 
   // Verify that only mods or admins can ban
-  check_community_mod_action(
-    &local_user_view.person,
-    &community,
-    false,
-    &mut context.pool(),
-  )
-  .await?;
+  check_community_mod_action(&local_user_view, &community, false, &mut context.pool()).await?;
 
   LocalUser::is_higher_mod_or_admin_check(
     &mut context.pool(),

crates/api/src/community/follow.rs

@@ -4,7 +4,7 @@ use lemmy_api_common::{
   community::{CommunityResponse, FollowCommunity},
   context::LemmyContext,
   send_activity::{ActivityChannel, SendActivityData},
-  utils::{check_community_deleted_removed, check_user_valid},
+  utils::{check_community_deleted_removed, check_local_user_valid},
 };
 use lemmy_db_schema::{
   source::{
@@ -22,7 +22,7 @@ pub async fn follow_community(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommunityResponse>> {
-  check_user_valid(&local_user_view.person)?;
+  check_local_user_valid(&local_user_view)?;
   let community = Community::read(&mut context.pool(), data.community_id).await?;
   let person_id = local_user_view.person.id;
 

crates/api/src/community/pending_follows/approve.rs

@@ -16,12 +16,7 @@ pub async fn post_pending_follows_approve(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<SuccessResponse>> {
-  is_mod_or_admin(
-    &mut context.pool(),
-    &local_user_view.person,
-    data.community_id,
-  )
-  .await?;
+  is_mod_or_admin(&mut context.pool(), &local_user_view, data.community_id).await?;
 
   let activity_data = if data.approve {
     CommunityActions::approve_follower(

crates/api/src/community/pending_follows/count.rs

@@ -12,12 +12,7 @@ pub async fn get_pending_follows_count(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<GetCommunityPendingFollowsCountResponse>> {
-  is_mod_or_admin(
-    &mut context.pool(),
-    &local_user_view.person,
-    data.community_id,
-  )
-  .await?;
+  is_mod_or_admin(&mut context.pool(), &local_user_view, data.community_id).await?;
   let count =
     CommunityFollowerView::count_approval_required(&mut context.pool(), data.community_id).await?;
   Ok(Json(GetCommunityPendingFollowsCountResponse { count }))

crates/api/src/community/transfer.rs

@@ -30,7 +30,7 @@ pub async fn transfer_community(
   let mut community_mods =
     CommunityModeratorView::for_community(&mut context.pool(), community.id).await?;
 
-  check_community_user_action(&local_user_view.person, &community, &mut context.pool()).await?;
+  check_community_user_action(&local_user_view, &community, &mut context.pool()).await?;
 
   // Make sure transferrer is either the top community mod, or an admin
   if !(is_top_mod(&local_user_view, &community_mods).is_ok() || is_admin(&local_user_view).is_ok())

crates/api/src/lib.rs

@@ -1,20 +1,5 @@
-use activitypub_federation::config::Data;
 use base64::{engine::general_purpose::STANDARD_NO_PAD as base64, Engine};
 use captcha::Captcha;
-use lemmy_api_common::{
-  community::BanFromCommunity,
-  context::LemmyContext,
-  send_activity::{ActivityChannel, SendActivityData},
-  utils::check_expire_time,
-};
-use lemmy_db_schema::{
-  source::{
-    community::{CommunityActions, CommunityPersonBanForm},
-    mod_log::moderator::{ModBanFromCommunity, ModBanFromCommunityForm},
-    person::Person,
-  },
-  traits::{Bannable, Crud, Followable},
-};
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::{
   error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
@@ -132,89 +117,6 @@ fn build_totp_2fa(hostname: &str, username: &str, secret: &str) -> LemmyResult<T
   .with_lemmy_type(LemmyErrorType::CouldntGenerateTotp)
 }
 
-/// Site bans are only federated for local users.
-/// This is a problem, because site-banning non-local users will still leave content
-/// they've posted to our local communities, on other servers.
-///
-/// So when doing a site ban for a non-local user, you need to federate/send a
-/// community ban for every local community they've participated in.
-/// See https://github.com/LemmyNet/lemmy/issues/4118
-pub(crate) async fn ban_nonlocal_user_from_local_communities(
-  local_user_view: &LocalUserView,
-  target: &Person,
-  ban: bool,
-  reason: &Option<String>,
-  remove_or_restore_data: &Option<bool>,
-  expires: &Option<i64>,
-  context: &Data<LemmyContext>,
-) -> LemmyResult<()> {
-  // Only run this code for federated users
-  if !target.local {
-    let ids = Person::list_local_community_ids(&mut context.pool(), target.id).await?;
-
-    for community_id in ids {
-      let expires_dt = check_expire_time(*expires)?;
-
-      // Ban / unban them from our local communities
-      let community_user_ban_form = CommunityPersonBanForm {
-        ban_expires: Some(expires_dt),
-        ..CommunityPersonBanForm::new(community_id, target.id)
-      };
-
-      if ban {
-        // Ignore all errors for these
-        CommunityActions::ban(&mut context.pool(), &community_user_ban_form)
-          .await
-          .ok();
-
-        // Also unsubscribe them from the community, if they are subscribed
-
-        CommunityActions::unfollow(&mut context.pool(), target.id, community_id)
-          .await
-          .ok();
-      } else {
-        CommunityActions::unban(&mut context.pool(), &community_user_ban_form)
-          .await
-          .ok();
-      }
-
-      // Mod tables
-      let form = ModBanFromCommunityForm {
-        mod_person_id: local_user_view.person.id,
-        other_person_id: target.id,
-        community_id,
-        reason: reason.clone(),
-        banned: Some(ban),
-        expires: expires_dt,
-      };
-
-      ModBanFromCommunity::create(&mut context.pool(), &form).await?;
-
-      // Federate the ban from community
-      let ban_from_community = BanFromCommunity {
-        community_id,
-        person_id: target.id,
-        ban,
-        reason: reason.clone(),
-        remove_or_restore_data: *remove_or_restore_data,
-        expires: *expires,
-      };
-
-      ActivityChannel::submit_activity(
-        SendActivityData::BanFromCommunity {
-          moderator: local_user_view.person.clone(),
-          community_id,
-          target: target.clone(),
-          data: ban_from_community,
-        },
-        context,
-      )?;
-    }
-  }
-
-  Ok(())
-}
-
 #[cfg(test)]
 mod tests {
 

crates/api/src/local_user/ban_person.rs

@@ -1,6 +1,6 @@
-use crate::ban_nonlocal_user_from_local_communities;
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
+use chrono::Utc;
 use lemmy_api_common::{
   context::LemmyContext,
   person::{BanPerson, BanPersonResponse},
@@ -9,16 +9,17 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::{
   source::{
+    instance::{InstanceActions, InstanceBanForm},
     local_user::LocalUser,
     login_token::LoginToken,
     mod_log::moderator::{ModBan, ModBanForm},
-    person::{Person, PersonUpdateForm},
+    person::Person,
   },
-  traits::Crud,
+  traits::{Bannable, Crud},
 };
 use lemmy_db_views::structs::{LocalUserView, PersonView};
 use lemmy_utils::{
-  error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
+  error::{LemmyErrorExt2, LemmyErrorType, LemmyResult},
   utils::validation::is_valid_body_field,
 };
 
@@ -44,20 +45,21 @@ pub async fn ban_from_site(
 
   let expires = check_expire_time(data.expires)?;
 
-  let person = Person::update(
+  let target_person = Person::read(&mut context.pool(), data.person_id).await?;
+  InstanceActions::ban(
     &mut context.pool(),
-    data.person_id,
-    &PersonUpdateForm {
-      banned: Some(data.ban),
-      ban_expires: Some(expires),
-      ..Default::default()
+    &InstanceBanForm {
+      person_id: target_person.id,
+      instance_id: target_person.instance_id,
+      received_ban: Utc::now(),
+      ban_expires: expires,
     },
   )
   .await
   .with_lemmy_type(LemmyErrorType::CouldntUpdateUser)?;
 
   // if its a local user, invalidate logins
-  let local_user = LocalUserView::read_person(&mut context.pool(), person.id).await;
+  let local_user = LocalUserView::read_person(&mut context.pool(), target_person.id).await;
   if let Ok(local_user) = local_user {
     LoginToken::invalidate_all(&mut context.pool(), local_user.local_user.id).await?;
   }
@@ -67,7 +69,7 @@ pub async fn ban_from_site(
     let removed = data.ban;
     remove_or_restore_user_data(
       local_user_view.person.id,
-      person.id,
+      target_person.id,
       removed,
       &data.reason,
       &context,
@@ -78,26 +80,16 @@ pub async fn ban_from_site(
   // Mod tables
   let form = ModBanForm {
     mod_person_id: local_user_view.person.id,
-    other_person_id: person.id,
+    other_person_id: target_person.id,
     reason: data.reason.clone(),
     banned: Some(data.ban),
     expires,
+    instance_id: local_user_view.person.instance_id,
   };
 
   ModBan::create(&mut context.pool(), &form).await?;
 
-  let person_view = PersonView::read(&mut context.pool(), person.id, false).await?;
-
-  ban_nonlocal_user_from_local_communities(
-    &local_user_view,
-    &person,
-    data.ban,
-    &data.reason,
-    &data.remove_or_restore_data,
-    &data.expires,
-    &context,
-  )
-  .await?;
+  let person_view = PersonView::read(&mut context.pool(), target_person.id, false).await?;
 
   ActivityChannel::submit_activity(
     SendActivityData::BanFromSite {

crates/api/src/local_user/login.rs

@@ -8,7 +8,7 @@ use lemmy_api_common::{
   claims::Claims,
   context::LemmyContext,
   person::{Login, LoginResponse},
-  utils::{check_email_verified, check_registration_application, check_user_valid},
+  utils::{check_email_verified, check_local_user_valid, check_registration_application},
 };
 use lemmy_db_views::structs::{LocalUserView, SiteView};
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
@@ -35,7 +35,7 @@ pub async fn login(
   if !valid {
     Err(LemmyErrorType::IncorrectLogin)?
   }
-  check_user_valid(&local_user_view.person)?;
+  check_local_user_valid(&local_user_view)?;
   check_email_verified(&local_user_view, &site_view)?;
 
   check_registration_application(&local_user_view, &site_view.local_site, &mut context.pool())

crates/api/src/post/feature.rs

@@ -28,13 +28,7 @@ pub async fn feature_post(
   let orig_post = Post::read(&mut context.pool(), post_id).await?;
 
   let community = Community::read(&mut context.pool(), orig_post.community_id).await?;
-  check_community_mod_action(
-    &local_user_view.person,
-    &community,
-    false,
-    &mut context.pool(),
-  )
-  .await?;
+  check_community_mod_action(&local_user_view, &community, false, &mut context.pool()).await?;
 
   if data.feature_type == PostFeatureType::Local {
     is_admin(&local_user_view)?;

crates/api/src/post/like.rs

@@ -40,12 +40,7 @@ pub async fn like_post(
   // Check for a community ban
   let post = PostView::read(&mut context.pool(), post_id, None, false).await?;
 
-  check_community_user_action(
-    &local_user_view.person,
-    &post.community,
-    &mut context.pool(),
-  )
-  .await?;
+  check_community_user_action(&local_user_view, &post.community, &mut context.pool()).await?;
 
   let like_form = PostLikeForm::new(data.post_id, local_user_view.person.id, data.score);
 

crates/api/src/post/list_post_likes.rs

@@ -15,12 +15,7 @@ pub async fn list_post_likes(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<ListPostLikesResponse>> {
   let post = Post::read(&mut context.pool(), data.post_id).await?;
-  is_mod_or_admin(
-    &mut context.pool(),
-    &local_user_view.person,
-    post.community_id,
-  )
-  .await?;
+  is_mod_or_admin(&mut context.pool(), &local_user_view, post.community_id).await?;
 
   let post_likes =
     VoteView::list_for_post(&mut context.pool(), data.post_id, data.page, data.limit).await?;

crates/api/src/post/lock.rs

@@ -26,7 +26,7 @@ pub async fn lock_post(
   let orig_post = PostView::read(&mut context.pool(), post_id, None, false).await?;
 
   check_community_mod_action(
-    &local_user_view.person,
+    &local_user_view,
     &orig_post.community,
     false,
     &mut context.pool(),