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

Fixing pretty print again.

Browse source
This commit is contained in:
Dessalines 2020-10-02 10:15:26 -05:00
parent eef0a5c7e8
commit 2e2b6eacd7
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lemmy_apub/src/community.rs
View file

@ -259,6 +259,7 @@ impl ActorType for Community {
.await??; .await??;
let inboxes = inboxes let inboxes = inboxes
.into_iter() .into_iter()
.filter(|i| !i.user_local)
.map(|u| -> Result<Url, LemmyError> { .map(|u| -> Result<Url, LemmyError> {
let url = Url::parse(&u.user_actor_id)?; let url = Url::parse(&u.user_actor_id)?;
let domain = url.domain().context(location_info!())?; let domain = url.domain().context(location_info!())?;

2
lemmy_apub/src/inbox/shared_inbox.rs
View file

@ -60,7 +60,7 @@ pub async fn shared_inbox(
) -> Result<HttpResponse, LemmyError> { ) -> Result<HttpResponse, LemmyError> {
let activity = input.into_inner(); let activity = input.into_inner();
let json = serde_json::to_string(&activity)?; let json = serde_json::to_string_pretty(&activity)?;
debug!("Shared inbox received activity: {}", json); debug!("Shared inbox received activity: {}", json);
// TODO: if we already received an activity with identical ID, then ignore this (same in other inboxes) // TODO: if we already received an activity with identical ID, then ignore this (same in other inboxes)

7
lemmy_db/src/activity.rs
View file

@ -62,11 +62,8 @@ pub fn do_insert_activity<T>(
where where
T: Serialize + Debug, T: Serialize + Debug,
{ {
debug!( debug!("inserting activity for user {}: ", user_id);
"inserting activity for user {}, data {:?}", debug!("{}", serde_json::to_string_pretty(&serde_json::to_value(&data)?)?);
user_id,
serde_json::to_string_pretty(&data).unwrap()
);
let activity_form = ActivityForm { let activity_form = ActivityForm {
user_id, user_id,
data: serde_json::to_value(&data)?, data: serde_json::to_value(&data)?,