From: Dessalines <tyhou13@gmx.com>
Date: Wed, 24 Mar 2021 15:51:34 +0000 (-0400)
Subject: Merge branch 'main' into move_matrix_and_admin_to_person
X-Git-Url: http://these/git/%7B%60/feeds/front/static/%7BpictrsAvatarThumbnail%28this.state.siteRes.site.icon%29%7D?a=commitdiff_plain;h=3ca2453fc675459290397c0cad11663ea0a5fab9;p=lemmy.git

Merge branch 'main' into move_matrix_and_admin_to_person
---

3ca2453fc675459290397c0cad11663ea0a5fab9
diff --cc crates/apub/src/objects/post.rs
index 8f01218a,f532fcc1..f5830843
--- a/crates/apub/src/objects/post.rs
+++ b/crates/apub/src/objects/post.rs
@@@ -216,8 -237,8 +237,8 @@@ impl FromApubToForm<PageExt> for PostFo
        embed_description: iframely_description,
        embed_html: iframely_html,
        thumbnail_url: pictrs_thumbnail.map(|u| u.into()),
-       ap_id: Some(check_object_domain(page, expected_domain)?),
+       ap_id: Some(ap_id),
 -      local: false,
 +      local: Some(false),
      })
    }
  }