aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

asyncify from_activity calls (i.e.: block_on())

Browse Source
This commit is contained in:
Igor Galić 2020-02-13 17:54:44 +01:00
parent 87ce3a7b51
commit 82088596a8
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plume-models/src/posts.rs
View File

@ -21,6 +21,7 @@ use plume_common::{
};
use serde_json;
use std::collections::HashSet;
use tokio::runtime::Runtime;
pub type LicensedArticle = CustomObject<Licensed, Article>;
@ -579,11 +580,14 @@ impl FromId<PlumeRocket> for Post {
}
});
let cover = article
let image = article
.object_props
.icon_object::<Image>()
.ok()
.and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id));
.unwrap();
let mut r = Runtime::new().unwrap();
let cover = Some(r.block_on(async {Media::from_activity(&c, &image).await.ok().unwrap().id}));
let title = article.object_props.name_string()?;
let post = Post::insert(
@ -699,17 +703,21 @@ impl FromId<PlumeRocket> for PostUpdate {
}
fn from_activity(c: &PlumeRocket, updated: LicensedArticle) -> Result<Self> {
let image = updated
.object
.object_props
.icon_object::<Image>()
.ok()
.unwrap();
let mut r = Runtime::new().unwrap();
let cover = Some(r.block_on(async {Media::from_activity(&c, &image).await.ok().unwrap().id}));
Ok(PostUpdate {
ap_url: updated.object.object_props.id_string()?,
title: updated.object.object_props.name_string().ok(),
subtitle: updated.object.object_props.summary_string().ok(),
content: updated.object.object_props.content_string().ok(),
cover: updated
.object
.object_props
.icon_object::<Image>()
.ok()
.and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id)),
cover: cover,
source: updated
.object
.ap_object_props