From 1836d017f94f558957a736a2d6d052af752b5e6c Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Wed, 8 Apr 2020 18:39:45 +0200 Subject: [PATCH] Simplify fetch_posts code --- server/src/apub/puller.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/server/src/apub/puller.rs b/server/src/apub/puller.rs index 7610d4640..a00f4d468 100644 --- a/server/src/apub/puller.rs +++ b/server/src/apub/puller.rs @@ -75,18 +75,12 @@ where } fn fetch_remote_community_posts( - instance: &Instance, community: &Community, conn: &PgConnection, ) -> Result, Error> { // TODO: need to add outbox field to Community - let endpoint = Url::parse(&format!( - "http://{}/federation/c/{}", - instance.domain, community.name - ))?; - let group = fetch_remote_object::(&endpoint)?; - let outbox_uri = Url::parse(&group.extension.get_outbox().to_string())?; - let outbox = fetch_remote_object::(&outbox_uri)?; + let outbox_url = Url::parse(&format!("{}/outbox", community.actor_id))?; + let outbox = fetch_remote_object::(&outbox_url)?; let items = outbox.collection_props.get_many_items_base_boxes(); Ok( @@ -129,7 +123,7 @@ pub fn fetch_all(conn: &PgConnection) -> Result<(), Error> { if let Some(community_list) = node_info.metadata.community_list_url { let communities = fetch_communities_from_instance(&community_list, conn)?; for c in communities { - fetch_remote_community_posts(instance, &c, conn)?; + fetch_remote_community_posts(&c, conn)?; } } else { warn!(