local_instance,
objects::{read_from_string_or_source_opt, verify_is_remote_object},
protocol::{
- objects::page::{Attachment, AttributedTo, Page, PageType},
+ objects::{
+ page::{Attachment, AttributedTo, Page, PageType},
+ LanguageTag,
+ },
ImageObject,
Source,
},
use chrono::NaiveDateTime;
use lemmy_api_common::{request::fetch_site_data, utils::blocking};
use lemmy_db_schema::{
+ self,
source::{
community::Community,
moderator::{ModLockPost, ModLockPostForm, ModStickyPost, ModStickyPostForm},
post::{Post, PostForm},
},
traits::Crud,
- {self},
};
use lemmy_utils::{
error::LemmyError,
Community::read(conn, community_id)
})
.await??;
+ let language = LanguageTag::new_single(self.language_id, context.pool()).await?;
let page = Page {
kind: PageType::Page,
comments_enabled: Some(!self.locked),
sensitive: Some(self.nsfw),
stickied: Some(self.stickied),
+ language,
published: Some(convert_datetime(self.published)),
updated: self.updated.map(convert_datetime),
};
// instance from the post author.
if !page.is_mod_action(context).await? {
verify_domains_match(page.id.inner(), expected_domain)?;
- verify_is_remote_object(page.id.inner())?;
+ verify_is_remote_object(page.id.inner(), context.settings())?;
};
let community = page.extract_community(context, request_counter).await?;
- check_apub_id_valid_with_strictness(page.id.inner(), community.local, &context.settings())?;
+ check_apub_id_valid_with_strictness(page.id.inner(), community.local, context.settings())?;
verify_person_in_community(&page.creator()?, &community, context, request_counter).await?;
check_slurs(&page.name, &context.settings().slur_regex())?;
verify_domains_match(page.creator()?.inner(), page.id.inner())?;
) -> Result<ApubPost, LemmyError> {
let creator = page
.creator()?
- .dereference::<LemmyError>(context, local_instance(context), request_counter)
+ .dereference(context, local_instance(context), request_counter)
.await?;
let community = page.extract_community(context, request_counter).await?;
let form = if !page.is_mod_action(context).await? {
let url = if let Some(attachment) = page.attachment.first() {
- // url as sent by Lemmy (new)
- Some(attachment.href.clone())
+ Some(match attachment {
+ // url as sent by Lemmy (new)
+ Attachment::Link(link) => link.href.clone(),
+ Attachment::Image(image) => image.url.clone(),
+ })
} else if page.kind == PageType::Video {
// we cant display videos directly, so insert a link to external video page
Some(page.id.inner().clone())
page.url
};
let (metadata_res, thumbnail_url) = if let Some(url) = &url {
- fetch_site_data(context.client(), &context.settings(), Some(url)).await
+ fetch_site_data(context.client(), context.settings(), Some(url)).await
} else {
(None, page.image.map(|i| i.url.into()))
};
let (embed_title, embed_description, embed_video_url) = metadata_res
- .map(|u| (u.title, u.description, u.embed_video_url))
+ .map(|u| (Some(u.title), Some(u.description), Some(u.embed_video_url)))
.unwrap_or_default();
let body_slurs_removed =
read_from_string_or_source_opt(&page.content, &page.media_type, &page.source)
- .map(|s| remove_slurs(&s, &context.settings().slur_regex()));
+ .map(|s| Some(remove_slurs(&s, &context.settings().slur_regex())));
+ let language_id = LanguageTag::to_language_id_single(page.language, context.pool()).await?;
PostForm {
name: page.name.clone(),
- url: url.map(Into::into),
+ url: Some(url.map(Into::into)),
body: body_slurs_removed,
creator_id: creator.id,
community_id: community.id,
embed_title,
embed_description,
embed_video_url,
- thumbnail_url,
+ thumbnail_url: Some(thumbnail_url),
ap_id: Some(page.id.clone().into()),
local: Some(false),
+ language_id,
}
} else {
// if is mod action, only update locked/stickied fields, nothing else
// read existing, local post if any (for generating mod log)
let old_post = ObjectId::<ApubPost>::new(page.id.clone())
- .dereference_local::<LemmyError>(context)
+ .dereference_local(context)
.await;
let post = blocking(context.pool(), move |conn| Post::upsert(conn, &form)).await??;
#[serial]
async fn test_parse_lemmy_post() {
let context = init_context();
+ let conn = &mut context.pool().get().unwrap();
let (person, site) = parse_lemmy_person(&context).await;
let community = parse_lemmy_community(&context).await;
assert!(post.stickied);
assert_eq!(request_counter, 0);
- Post::delete(&*context.pool().get().unwrap(), post.id).unwrap();
- Person::delete(&*context.pool().get().unwrap(), person.id).unwrap();
- Community::delete(&*context.pool().get().unwrap(), community.id).unwrap();
- Site::delete(&*context.pool().get().unwrap(), site.id).unwrap();
+ Post::delete(conn, post.id).unwrap();
+ Person::delete(conn, person.id).unwrap();
+ Community::delete(conn, community.id).unwrap();
+ Site::delete(conn, site.id).unwrap();
}
}