diff options
| author | Felix Ableitner <me@nutomic.com> | 2020-04-07 23:02:32 +0200 |
|---|---|---|
| committer | Felix Ableitner <me@nutomic.com> | 2020-04-07 23:02:32 +0200 |
| commit | 61c560c12c0edb56d006ba2c6ab07013567ffab8 (patch) | |
| tree | 8dc666c604abe5b0d1468ca432bd247042de8cd3 /server/src/apub/community.rs | |
| parent | d3bd7771d2a3cfbb24084e44083dc70f02b4ba8c (diff) | |
Get users federated
Diffstat (limited to 'server/src/apub/community.rs')
| -rw-r--r-- | server/src/apub/community.rs | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/server/src/apub/community.rs b/server/src/apub/community.rs index eb98a6f6..83895196 100644 --- a/server/src/apub/community.rs +++ b/server/src/apub/community.rs @@ -1,11 +1,13 @@ -use crate::apub::puller::fetch_remote_object; +use crate::apub::puller::{fetch_remote_object, fetch_remote_user}; use crate::apub::*; -use crate::convert_datetime; use crate::db::community::{Community, CommunityForm}; use crate::db::community_view::CommunityFollowerView; use crate::db::establish_unpooled_connection; use crate::db::post::Post; +use crate::db::user::User_; +use crate::db::Crud; use crate::settings::Settings; +use crate::{convert_datetime, naive_now}; use activitystreams::actor::properties::ApActorProperties; use activitystreams::collection::OrderedCollection; use activitystreams::{ @@ -30,9 +32,9 @@ pub async fn get_apub_community_list( db: web::Data<Pool<ConnectionManager<PgConnection>>>, ) -> Result<HttpResponse<Body>, Error> { // TODO: implement pagination - let communities = Community::list(&db.get().unwrap())? + let communities = Community::list_local(&db.get().unwrap())? .iter() - .map(|c| c.as_group()) + .map(|c| c.as_group(&db.get().unwrap())) .collect::<Result<Vec<GroupExt>, Error>>()?; let mut collection = UnorderedCollection::default(); let oprops: &mut ObjectProperties = collection.as_mut(); @@ -50,21 +52,19 @@ pub async fn get_apub_community_list( } impl Community { - fn as_group(&self) -> Result<GroupExt, Error> { + fn as_group(&self, conn: &PgConnection) -> Result<GroupExt, Error> { let base_url = make_apub_endpoint(EndpointType::Community, &self.name); let mut group = Group::default(); let oprops: &mut ObjectProperties = group.as_mut(); + let creator = User_::read(conn, self.creator_id)?; oprops .set_context_xsd_any_uri(context())? .set_id(base_url.to_owned())? .set_name_xsd_string(self.name.to_owned())? .set_published(convert_datetime(self.published))? - .set_attributed_to_xsd_any_uri(make_apub_endpoint( - EndpointType::User, - &self.creator_id.to_string(), - ))?; + .set_attributed_to_xsd_any_uri(make_apub_endpoint(EndpointType::User, &creator.name))?; if let Some(u) = self.updated.to_owned() { oprops.set_updated(convert_datetime(u))?; @@ -86,19 +86,23 @@ impl Community { } impl CommunityForm { - pub fn from_group(group: &GroupExt) -> Result<Self, Error> { + pub fn from_group(group: &GroupExt, conn: &PgConnection) -> Result<Self, Error> { let followers_uri = &group.extension.get_followers().unwrap().to_string(); let outbox_uri = &group.extension.get_outbox().to_string(); let _outbox = fetch_remote_object::<OrderedCollection>(outbox_uri)?; let _followers = fetch_remote_object::<UnorderedCollection>(followers_uri)?; let oprops = &group.base.object_props; let aprops = &group.extension; + let creator = fetch_remote_user( + &oprops.get_attributed_to_xsd_any_uri().unwrap().to_string(), + conn, + )?; Ok(CommunityForm { name: oprops.get_name_xsd_string().unwrap().to_string(), title: aprops.get_preferred_username().unwrap().to_string(), description: oprops.get_summary_xsd_string().map(|s| s.to_string()), category_id: 1, - creator_id: 2, //community.object_props.get_attributed_to_xsd_any_uri() + creator_id: creator.id, removed: None, published: oprops .get_published() @@ -112,7 +116,7 @@ impl CommunityForm { local: false, private_key: None, public_key: None, - last_refreshed_at: None, + last_refreshed_at: Some(naive_now()), }) } } @@ -122,7 +126,7 @@ pub async fn get_apub_community_http( db: web::Data<Pool<ConnectionManager<PgConnection>>>, ) -> Result<HttpResponse<Body>, Error> { let community = Community::read_from_name(&&db.get()?, info.community_name.to_owned())?; - let c = community.as_group()?; + let c = community.as_group(&db.get().unwrap())?; Ok(create_apub_response(&c)) } @@ -156,9 +160,9 @@ pub async fn get_apub_community_outbox( let community = Community::read_from_name(&&db.get()?, info.community_name.to_owned())?; let base_url = make_apub_endpoint(EndpointType::Community, &community.name); - let connection = establish_unpooled_connection(); + let conn = establish_unpooled_connection(); //As we are an object, we validated that the community id was valid - let community_posts: Vec<Post> = Post::list_for_community(&connection, community.id)?; + let community_posts: Vec<Post> = Post::list_for_community(&conn, community.id)?; let mut collection = OrderedCollection::default(); let oprops: &mut ObjectProperties = collection.as_mut(); @@ -170,7 +174,7 @@ pub async fn get_apub_community_outbox( .set_many_items_base_boxes( community_posts .iter() - .map(|c| c.as_page().unwrap()) + .map(|c| c.as_page(&conn).unwrap()) .collect(), )? .set_total_items(community_posts.len() as u64)?; |