zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

feat: fetch related things

Browse source 
fetching an object will get its author
fetching an activity will get its object and author
This commit is contained in:
əlemi 2024-04-23 17:56:46 +02:00
parent 1741837bd0
commit 4b4d52ef6f
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/server/fetcher.rs
View file

@ -1,6 +1,6 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use apb::{target::Addressed, Object}; use apb::{target::Addressed, Activity, Object};
use base64::Engine; use base64::Engine;
use reqwest::{header::{ACCEPT, CONTENT_TYPE, USER_AGENT}, Method, Response}; use reqwest::{header::{ACCEPT, CONTENT_TYPE, USER_AGENT}, Method, Response};
use sea_orm::{EntityTrait, IntoActiveModel}; use sea_orm::{EntityTrait, IntoActiveModel};
@ -86,6 +86,9 @@ impl Fetcher for Context {
).await?.json::<serde_json::Value>().await?; ).await?.json::<serde_json::Value>().await?;
let user_model = model::user::Model::new(&user)?; let user_model = model::user::Model::new(&user)?;
// TODO this may fail: while fetching, remote server may fetch our service actor.
// if it does so with http signature, we will fetch that actor in background
// meaning that, once we reach here, it's already inserted and returns an UNIQUE error
model::user::Entity::insert(user_model.clone().into_active_model()) model::user::Entity::insert(user_model.clone().into_active_model())
.exec(self.db()).await?; .exec(self.db()).await?;
@ -101,6 +104,18 @@ impl Fetcher for Context {
Method::GET, id, None, &format!("https://{}", self.domain()), &self.app().private_key, self.domain(), Method::GET, id, None, &format!("https://{}", self.domain()), &self.app().private_key, self.domain(),
).await?.json::<serde_json::Value>().await?; ).await?.json::<serde_json::Value>().await?;
if let Some(activity_actor) = activity.actor().id() {
if let Err(e) = self.fetch_user(&activity_actor).await {
tracing::warn!("could not get actor of fetched activity: {e}");
}
}
if let Some(activity_object) = activity.object().id() {
if let Err(e) = self.fetch_object(&activity_object).await {
tracing::warn!("could not get object of fetched activity: {e}");
}
}
let addressed = activity.addressed(); let addressed = activity.addressed();
let activity_model = model::activity::Model::new(&activity)?; let activity_model = model::activity::Model::new(&activity)?;
@ -128,6 +143,12 @@ async fn fetch_object_inner(ctx: &Context, id: &str, depth: usize) -> crate::Res
Method::GET, id, None, &format!("https://{}", ctx.domain()), &ctx.app().private_key, ctx.domain(), Method::GET, id, None, &format!("https://{}", ctx.domain()), &ctx.app().private_key, ctx.domain(),
).await?.json::<serde_json::Value>().await?; ).await?.json::<serde_json::Value>().await?;
if let Some(attributed_to) = object.attributed_to().id() {
if let Err(e) = ctx.fetch_user(&attributed_to).await {
tracing::warn!("could not get actor of fetched object: {e}");
}
}
let addressed = object.addressed(); let addressed = object.addressed();
let mut object_model = model::object::Model::new(&object)?; let mut object_model = model::object::Model::new(&object)?;