Merge branch 'main' into no_conflict_triggers

diff --cc lemmy_apub/src/comment.rs
Simple merge

diff --cc lemmy_apub/src/inbox/community_inbox.rs
index d979e27fe7c44f359532296091bda7e0d35bfc4f,6f5f1854ee066397dab03f87517e80e93d2901d3..e4ee7b37521fad47e34be04df06b2a38c9354ab9
--- 1/lemmy_apub/src/inbox/community_inbox.rs
--- 2/lemmy_apub/src/inbox/community_inbox.rs
+++ b/lemmy_apub/src/inbox/community_inbox.rs
@@@ -48,15 -48,10 +48,19 @@@ pub async fn community_inbox
    })
    .await??;
  
 +  if !community.local {
 +    return Err(
 +      anyhow!(
 +        "Received activity is addressed to remote community {}",
 +        &community.actor_id
 +      )
 +      .into(),
 +    );
 +  }
+   debug!(
+     "Community {} received activity {:?}",
+     &community.name, &activity
+   );
    let user_uri = activity
      .actor()?
      .as_single_xsd_any_uri()

diff --cc lemmy_apub/src/post.rs
Simple merge

diff --cc lemmy_db/src/activity.rs
Simple merge