Post thumbnail and user icons federating.

This commit is contained in:
Dessalines 2020-05-15 20:23:20 -04:00
parent 940dc73f28
commit 020b9b8cdd
4 changed files with 49 additions and 3 deletions

View File

@ -130,6 +130,9 @@ pub fn get_or_fetch_and_upsert_remote_user(
if !u.local
&& u
.last_refreshed_at
// TODO it won't pick up new avatars, summaries etc until a day after.
// Both user and community need an "update" action pushed to other servers
// to fix this
.lt(&(naive_now() - chrono::Duration::days(1)))
{
debug!("Fetching and updating from remote user: {}", apub_id);

View File

@ -21,7 +21,7 @@ use activitystreams::{
endpoint::EndpointProperties,
ext::{Ext, Extensible},
link::Mention,
object::{properties::ObjectProperties, Note, Page, Tombstone},
object::{properties::ObjectProperties, AnyImage, Image, Note, Page, Tombstone},
public, BaseBox,
};
use actix_web::body::Body;

View File

@ -53,6 +53,20 @@ impl ToApub for Post {
oprops.set_url_xsd_any_uri(u.to_owned())?;
}
if let Some(thumbnail_url) = &self.thumbnail_url {
let full_url = format!(
"{}://{}/pictshare/{}",
get_apub_protocol_string(),
Settings::get().hostname,
thumbnail_url
);
let mut image = Image::new();
image.object_props.set_url_xsd_any_uri(full_url)?;
let any_image = AnyImage::from_concrete(image)?;
oprops.set_image_any_image(any_image)?;
}
if let Some(u) = self.updated {
oprops.set_updated(convert_datetime(u))?;
}
@ -87,6 +101,16 @@ impl FromApub for PostForm {
let community_actor_id = &oprops.get_to_xsd_any_uri().unwrap().to_string();
let community = get_or_fetch_and_upsert_remote_community(&community_actor_id, &conn)?;
let thumbnail_url = match oprops.get_image_any_image() {
Some(any_image) => any_image
.to_owned()
.into_concrete::<Image>()?
.object_props
.get_url_xsd_any_uri()
.map(|u| u.to_string()),
None => None,
};
Ok(PostForm {
name: oprops.get_summary_xsd_string().unwrap().to_string(),
url: oprops.get_url_xsd_any_uri().map(|u| u.to_string()),
@ -107,7 +131,7 @@ impl FromApub for PostForm {
embed_title: None, // -> attachment? or fetch the embed locally
embed_description: None,
embed_html: None,
thumbnail_url: None,
thumbnail_url,
ap_id: oprops.get_id().unwrap().to_string(),
local: false,
})

View File

@ -27,6 +27,15 @@ impl ToApub for User_ {
oprops.set_name_xsd_string(i.to_owned())?;
}
if let Some(avatar_url) = &self.avatar {
let mut image = Image::new();
image
.object_props
.set_url_xsd_any_uri(avatar_url.to_owned())?;
let any_image = AnyImage::from_concrete(image)?;
oprops.set_icon_any_image(any_image)?;
}
let mut endpoint_props = EndpointProperties::default();
endpoint_props.set_shared_inbox(self.get_shared_inbox_url())?;
@ -152,6 +161,16 @@ impl FromApub for UserForm {
let aprops = &person.base.extension;
let public_key: &PublicKey = &person.extension.public_key;
let avatar = match oprops.get_icon_any_image() {
Some(any_image) => any_image
.to_owned()
.into_concrete::<Image>()?
.object_props
.get_url_xsd_any_uri()
.map(|u| u.to_string()),
None => None,
};
Ok(UserForm {
name: oprops.get_name_xsd_string().unwrap().to_string(),
preferred_username: aprops.get_preferred_username().map(|u| u.to_string()),
@ -159,7 +178,7 @@ impl FromApub for UserForm {
admin: false,
banned: false,
email: None,
avatar: None, // -> icon, image
avatar,
updated: oprops
.get_updated()
.map(|u| u.as_ref().to_owned().naive_local()),