From: Dessalines <tyhou13@gmx.com>
Date: Thu, 8 Oct 2020 01:57:29 +0000 (-0500)
Subject: Merge branch 'main' into no_conflict_triggers
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%7BpictshareAvatarThumbnail%28admin.avatar%29%7D?a=commitdiff_plain;h=c08d891742322c24f6f6091b83af4e6a1c7fe076;p=lemmy.git

Merge branch 'main' into no_conflict_triggers
---

c08d891742322c24f6f6091b83af4e6a1c7fe076
diff --cc lemmy_apub/src/inbox/community_inbox.rs
index d979e27f,6f5f1854..e4ee7b37
--- a/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()