Merge branch 'main' into move_matrix_and_admin_to_person
authorDessalines <tyhou13@gmx.com>
Wed, 24 Mar 2021 15:51:34 +0000 (11:51 -0400)
committerDessalines <tyhou13@gmx.com>
Wed, 24 Mar 2021 15:51:34 +0000 (11:51 -0400)
1  2 
crates/api/src/community.rs
crates/apub/src/objects/comment.rs
crates/apub/src/objects/community.rs
crates/apub/src/objects/person.rs
crates/apub/src/objects/post.rs
crates/apub/src/objects/private_message.rs

Simple merge
Simple merge
Simple merge
Simple merge
index 8f01218a90e945ff2899a5c533aa290816c19dcd,f532fcc1dd70e97cc7503a398080a5ae2e2e0ae2..f5830843eb6c7c63644b4748a52d9240ee678feb
@@@ -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),
      })
    }
  }