Receive and store remote site bans (fixes #3399)

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": "1.0.0-action-structs.1",
+    "lemmy-js-client": "1.0.0-site-person-ban.1",
     "prettier": "^3.5.0",
     "ts-jest": "^29.1.0",
     "tsoa": "^6.6.0",

api_tests/src/post.spec.ts

@@ -40,6 +40,7 @@ import {
   getMyUser,
   listInbox,
   getModlog,
+  getCommunity,
 } from "./shared";
 import { PostView } from "lemmy-js-client/dist/types/PostView";
 import { AdminBlockInstanceParams } from "lemmy-js-client/dist/types/AdminBlockInstanceParams";
@@ -461,7 +462,7 @@ test("Search for a post", async () => {
   expect(betaPost?.post.name).toBeDefined();
 });
 
-test("Enforce site ban federation for local user", async () => {
+test.only("Enforce site ban federation for local user", async () => {
   if (!betaCommunity) {
     throw "Missing beta community";
   }
@@ -499,9 +500,11 @@ test("Enforce site ban federation for local user", async () => {
   // alpha ban should be federated to beta
   let alphaUserOnBeta1 = await waitUntil(
     () => resolvePerson(beta, alphaUserActorId!),
-    res => res.person?.person.banned ?? false,
+    res => res.person?.home_instance_actions?.received_ban != null,
   );
-  expect(alphaUserOnBeta1.person?.person.banned).toBe(true);
+  expect(
+    alphaUserOnBeta1.person?.home_instance_actions?.received_ban,
+  ).toBeDefined();
 
   // existing alpha post should be removed on beta
   let betaBanRes = await waitUntil(
@@ -557,7 +560,9 @@ test("Enforce site ban federation for federated user", async () => {
   await followBeta(alphaUserHttp);
 
   let alphaUserOnBeta2 = await resolvePerson(beta, alphaUserActorId!);
-  expect(alphaUserOnBeta2.person?.person.banned).toBe(false);
+  expect(
+    alphaUserOnBeta2.person?.instance_actions?.received_ban,
+  ).toBeUndefined();
 
   if (!alphaUserOnBeta2.person) {
     throw "Missing alpha person";
@@ -577,29 +582,35 @@ test("Enforce site ban federation for federated user", async () => {
   );
   expect(banAlphaOnBeta.banned).toBe(true);
 
-  // The beta site ban should NOT be federated to alpha
-  let alphaPerson2 = (await getMyUser(alphaUserHttp)).local_user_view.person;
-  expect(alphaPerson2.banned).toBe(false);
-
   // existing alpha post should be removed on beta
-  let betaBanRes = await waitUntil(
-    () => getPost(beta, searchBeta1.post.id),
-    s => s.post_view.post.removed,
-  );
-  expect(betaBanRes.post_view.post.removed).toBe(true);
+  let betaRemovedPost = await getPost(beta, searchBeta1.post.id);
+  expect(betaRemovedPost.post_view.post.removed).toBe(true);
 
-  // existing alpha's post to the beta community should be removed on alpha
-  let alphaPostAfterRemoveOnBeta = await waitUntil(
+  // post should also be removed on alpha
+  let alphaRemovedPost = await waitUntil(
     () => getPost(alpha, postRes1.post_view.post.id),
     s => s.post_view.post.removed,
   );
-  expect(betaBanRes.post_view.post.removed).toBe(true);
-  expect(alphaPostAfterRemoveOnBeta.post_view.post.removed).toBe(true);
+  expect(alphaRemovedPost.post_view.post.removed).toBe(true);
+
+  // User should not be shown to be banned from alpha
+  let alphaPerson2 = (await getMyUser(alphaUserHttp)).local_user_view;
+  expect(alphaPerson2.instance_actions?.received_ban).toBeUndefined();
+
+  // but the ban should be indicated by beta community on alpha
+  let communityWithBan = await getCommunity(
+    alphaUserHttp,
+    betaCommunity.community.id,
+  );
   expect(
-    alphaPostAfterRemoveOnBeta.post_view.creator_community_actions
-      ?.received_ban,
+    communityWithBan.community_view.instance_actions?.received_ban,
   ).toBeDefined();
 
+  // post to beta community is rejected
+  await expect(
+    createPost(alphaUserHttp, betaCommunity.community.id),
+  ).rejects.toStrictEqual(Error("site_ban"));
+
   await unfollowRemotes(alpha);
 });
 

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

@@ -12,11 +12,10 @@ use lemmy_db_schema::{
   source::{
     comment::{CommentActions, CommentLikeForm},
     comment_reply::CommentReply,
-    local_site::LocalSite,
   },
   traits::Likeable,
 };
-use lemmy_db_views::structs::{CommentView, LocalUserView};
+use lemmy_db_views::structs::{CommentView, LocalUserView, SiteView};
 use lemmy_utils::error::LemmyResult;
 use std::ops::Deref;
 
@@ -25,7 +24,7 @@ pub async fn like_comment(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommentResponse>> {
-  let local_site = LocalSite::read(&mut context.pool()).await?;
+  let local_site = SiteView::read_local(&mut context.pool()).await?.local_site;
   let comment_id = data.comment_id;
 
   let mut recipient_ids = Vec::<LocalUserId>::new();
@@ -48,7 +47,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/random.rs

@@ -5,20 +5,16 @@ use lemmy_api_common::{
   context::LemmyContext,
   utils::{check_private_instance, is_mod_or_admin_opt},
 };
-use lemmy_db_schema::source::{
-  actor_language::CommunityLanguage,
-  community::Community,
-  local_site::LocalSite,
-};
-use lemmy_db_views::structs::{CommunityView, LocalUserView};
+use lemmy_db_schema::source::{actor_language::CommunityLanguage, community::Community};
+use lemmy_db_views::structs::{CommunityView, LocalUserView, SiteView};
 use lemmy_utils::error::LemmyResult;
 
 pub async fn get_random_community(
   data: Query<GetRandomCommunity>,
   context: Data<LemmyContext>,
   local_user_view: Option<LocalUserView>,
 ) -> LemmyResult<Json<CommunityResponse>> {
-  let local_site = LocalSite::read(&mut context.pool()).await?;
+  let local_site = SiteView::read_local(&mut context.pool()).await?.local_site;
 
   check_private_instance(&local_user_view, &local_site)?;
 

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())