grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing activity serialization. Fixes #1900 (#1901)

Browse source
This commit is contained in:
Dessalines 2021-11-15 15:26:48 -05:00 committed by GitHub
parent 497564359b
commit 09cd32034b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/apub/src/context.rs
View file

@ -25,3 +25,19 @@ impl<T> WithContext<T> {
self.inner self.inner
} }
} }
#[derive(Serialize, Deserialize)]
pub(crate) struct WithContextJson {
#[serde(rename = "@context")]
context: OneOrMany<AnyBase>,
inner: serde_json::Value,
}
impl WithContextJson {
pub(crate) fn new(inner: serde_json::Value) -> WithContextJson {
WithContextJson {
context: CONTEXT.clone(),
inner,
}
}
}

10
crates/apub/src/http/mod.rs
View file

@ -1,7 +1,7 @@
use crate::{ use crate::{
activity_lists::SharedInboxActivities, activity_lists::SharedInboxActivities,
check_is_apub_id_valid, check_is_apub_id_valid,
context::WithContext, context::{WithContext, WithContextJson},
fetcher::user_or_community::UserOrCommunity, fetcher::user_or_community::UserOrCommunity,
http::{community::receive_group_inbox, person::receive_person_inbox}, http::{community::receive_group_inbox, person::receive_person_inbox},
insert_activity, insert_activity,
@ -129,6 +129,12 @@ where
.json(WithContext::new(data)) .json(WithContext::new(data))
} }
fn create_json_apub_response(data: serde_json::Value) -> HttpResponse<Body> {
HttpResponse::Ok()
.content_type(APUB_JSON_CONTENT_TYPE)
.json(WithContextJson::new(data))
}
fn create_apub_tombstone_response<T>(data: &T) -> HttpResponse<Body> fn create_apub_tombstone_response<T>(data: &T) -> HttpResponse<Body>
where where
T: Serialize, T: Serialize,
@ -167,7 +173,7 @@ pub(crate) async fn get_activity(
if !activity.local || sensitive { if !activity.local || sensitive {
Ok(HttpResponse::NotFound().finish()) Ok(HttpResponse::NotFound().finish())
} else { } else {
Ok(create_apub_response(&activity.data)) Ok(create_json_apub_response(activity.data))
} }
} }