mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-09-10 00:18:49 -06:00
Merge branch 'federated_embeds' into federation
This commit is contained in:
commit
a9af247f1e
@ -169,6 +169,9 @@ pub fn get_or_fetch_and_upsert_remote_user(
|
|||||||
if !u.local
|
if !u.local
|
||||||
&& u
|
&& u
|
||||||
.last_refreshed_at
|
.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)))
|
.lt(&(naive_now() - chrono::Duration::days(1)))
|
||||||
{
|
{
|
||||||
debug!("Fetching and updating from remote user: {}", apub_id);
|
debug!("Fetching and updating from remote user: {}", apub_id);
|
||||||
|
@ -6,6 +6,7 @@ use crate::{
|
|||||||
create_tombstone,
|
create_tombstone,
|
||||||
extensions::page_extension::PageExtension,
|
extensions::page_extension::PageExtension,
|
||||||
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
||||||
|
get_apub_protocol_string,
|
||||||
ActorType,
|
ActorType,
|
||||||
ApubLikeableType,
|
ApubLikeableType,
|
||||||
ApubObjectType,
|
ApubObjectType,
|
||||||
@ -22,11 +23,12 @@ use crate::{
|
|||||||
Crud,
|
Crud,
|
||||||
},
|
},
|
||||||
routes::DbPoolParam,
|
routes::DbPoolParam,
|
||||||
|
Settings,
|
||||||
};
|
};
|
||||||
use activitystreams::{
|
use activitystreams::{
|
||||||
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
||||||
context,
|
context,
|
||||||
object::{kind::PageType, properties::ObjectProperties, Page, Tombstone},
|
object::{kind::PageType, properties::ObjectProperties, AnyImage, Image, Page, Tombstone},
|
||||||
BaseBox,
|
BaseBox,
|
||||||
};
|
};
|
||||||
use activitystreams_ext::Ext1;
|
use activitystreams_ext::Ext1;
|
||||||
@ -86,6 +88,46 @@ impl ToApub for Post {
|
|||||||
let url = self.url.as_ref().filter(|u| !u.is_empty());
|
let url = self.url.as_ref().filter(|u| !u.is_empty());
|
||||||
if let Some(u) = url {
|
if let Some(u) = url {
|
||||||
oprops.set_url_xsd_any_uri(u.to_owned())?;
|
oprops.set_url_xsd_any_uri(u.to_owned())?;
|
||||||
|
|
||||||
|
// Embeds
|
||||||
|
let mut page_preview = Page::new();
|
||||||
|
page_preview
|
||||||
|
.object_props
|
||||||
|
.set_url_xsd_any_uri(u.to_owned())?;
|
||||||
|
|
||||||
|
if let Some(embed_title) = &self.embed_title {
|
||||||
|
page_preview
|
||||||
|
.object_props
|
||||||
|
.set_name_xsd_string(embed_title.to_owned())?;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(embed_description) = &self.embed_description {
|
||||||
|
page_preview
|
||||||
|
.object_props
|
||||||
|
.set_summary_xsd_string(embed_description.to_owned())?;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(embed_html) = &self.embed_html {
|
||||||
|
page_preview
|
||||||
|
.object_props
|
||||||
|
.set_content_xsd_string(embed_html.to_owned())?;
|
||||||
|
}
|
||||||
|
|
||||||
|
oprops.set_preview_base_box(page_preview)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
if let Some(u) = self.updated {
|
||||||
@ -121,9 +163,40 @@ impl FromApub for PostForm {
|
|||||||
let community_actor_id = &oprops.get_to_xsd_any_uri().unwrap().to_string();
|
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 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,
|
||||||
|
};
|
||||||
|
|
||||||
|
let url = oprops.get_url_xsd_any_uri().map(|u| u.to_string());
|
||||||
|
let (embed_title, embed_description, embed_html) = match oprops.get_preview_base_box() {
|
||||||
|
Some(preview) => {
|
||||||
|
let preview_page = preview.to_owned().into_concrete::<Page>()?;
|
||||||
|
let name = preview_page
|
||||||
|
.object_props
|
||||||
|
.get_name_xsd_string()
|
||||||
|
.map(|n| n.to_string());
|
||||||
|
let summary = preview_page
|
||||||
|
.object_props
|
||||||
|
.get_summary_xsd_string()
|
||||||
|
.map(|s| s.to_string());
|
||||||
|
let content = preview_page
|
||||||
|
.object_props
|
||||||
|
.get_content_xsd_string()
|
||||||
|
.map(|c| c.to_string());
|
||||||
|
(name, summary, content)
|
||||||
|
}
|
||||||
|
None => (None, None, None),
|
||||||
|
};
|
||||||
|
|
||||||
Ok(PostForm {
|
Ok(PostForm {
|
||||||
name: oprops.get_summary_xsd_string().unwrap().to_string(),
|
name: oprops.get_summary_xsd_string().unwrap().to_string(),
|
||||||
url: oprops.get_url_xsd_any_uri().map(|u| u.to_string()),
|
url,
|
||||||
body: oprops.get_content_xsd_string().map(|c| c.to_string()),
|
body: oprops.get_content_xsd_string().map(|c| c.to_string()),
|
||||||
creator_id: creator.id,
|
creator_id: creator.id,
|
||||||
community_id: community.id,
|
community_id: community.id,
|
||||||
@ -137,11 +210,11 @@ impl FromApub for PostForm {
|
|||||||
.map(|u| u.as_ref().to_owned().naive_local()),
|
.map(|u| u.as_ref().to_owned().naive_local()),
|
||||||
deleted: None,
|
deleted: None,
|
||||||
nsfw: ext.sensitive,
|
nsfw: ext.sensitive,
|
||||||
stickied: None, // -> put it in "featured" collection of the community
|
stickied: None, // -> put it in "featured" collection of the community
|
||||||
embed_title: None, // -> attachment? or fetch the embed locally
|
embed_title,
|
||||||
embed_description: None,
|
embed_description,
|
||||||
embed_html: None,
|
embed_html,
|
||||||
thumbnail_url: None,
|
thumbnail_url,
|
||||||
ap_id: oprops.get_id().unwrap().to_string(),
|
ap_id: oprops.get_id().unwrap().to_string(),
|
||||||
local: false,
|
local: false,
|
||||||
})
|
})
|
||||||
|
@ -21,7 +21,7 @@ use activitystreams::{
|
|||||||
actor::{properties::ApActorProperties, Person},
|
actor::{properties::ApActorProperties, Person},
|
||||||
context,
|
context,
|
||||||
endpoint::EndpointProperties,
|
endpoint::EndpointProperties,
|
||||||
object::{properties::ObjectProperties, Tombstone},
|
object::{properties::ObjectProperties, AnyImage, Image, Tombstone},
|
||||||
};
|
};
|
||||||
use activitystreams_ext::Ext2;
|
use activitystreams_ext::Ext2;
|
||||||
use actix_web::{body::Body, web::Path, HttpResponse, Result};
|
use actix_web::{body::Body, web::Path, HttpResponse, Result};
|
||||||
@ -56,6 +56,15 @@ impl ToApub for User_ {
|
|||||||
oprops.set_name_xsd_string(i.to_owned())?;
|
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();
|
let mut endpoint_props = EndpointProperties::default();
|
||||||
|
|
||||||
endpoint_props.set_shared_inbox(self.get_shared_inbox_url())?;
|
endpoint_props.set_shared_inbox(self.get_shared_inbox_url())?;
|
||||||
@ -181,6 +190,16 @@ impl FromApub for UserForm {
|
|||||||
let aprops = &person.ext_one;
|
let aprops = &person.ext_one;
|
||||||
let public_key: &PublicKey = &person.ext_two.public_key;
|
let public_key: &PublicKey = &person.ext_two.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 {
|
Ok(UserForm {
|
||||||
name: oprops.get_name_xsd_string().unwrap().to_string(),
|
name: oprops.get_name_xsd_string().unwrap().to_string(),
|
||||||
preferred_username: aprops.get_preferred_username().map(|u| u.to_string()),
|
preferred_username: aprops.get_preferred_username().map(|u| u.to_string()),
|
||||||
@ -188,7 +207,7 @@ impl FromApub for UserForm {
|
|||||||
admin: false,
|
admin: false,
|
||||||
banned: false,
|
banned: false,
|
||||||
email: None,
|
email: None,
|
||||||
avatar: None, // -> icon, image
|
avatar,
|
||||||
updated: oprops
|
updated: oprops
|
||||||
.get_updated()
|
.get_updated()
|
||||||
.map(|u| u.as_ref().to_owned().naive_local()),
|
.map(|u| u.as_ref().to_owned().naive_local()),
|
||||||
|
Loading…
Reference in New Issue
Block a user