FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Use "name" property if "content" is not available in get_note_content

Browse source
This commit is contained in:
silverpill 2022-05-12 15:38:40 +00:00
parent e2d2e2e5de
commit 425a5d9331
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/activitypub/inbox/create_note.rs
View file

@ -18,7 +18,7 @@ use crate::activitypub::receiver::{
parse_object_id,
parse_property_value,
};
use crate::activitypub::vocabulary::{DOCUMENT, HASHTAG, IMAGE, MENTION, NOTE, PAGE};
use crate::activitypub::vocabulary::{DOCUMENT, HASHTAG, IMAGE, MENTION, NOTE};
use crate::config::Instance;
use crate::errors::{DatabaseError, ValidationError};
use crate::models::attachments::queries::create_attachment;
@ -49,12 +49,10 @@ fn get_note_author_id(object: &Object) -> Result<String, ValidationError> {
const CONTENT_MAX_SIZE: usize = 100000;
pub fn get_note_content(object: &Object) -> Result<String, ValidationError> {
let content = if object.object_type == PAGE {
// Lemmy Page
object.name.as_ref().ok_or(ValidationError("no content"))?
} else {
object.content.as_ref().ok_or(ValidationError("no content"))?
};
let content = object.content.as_ref()
// Lemmy pages and PeerTube videos have "name" property
.or(object.name.as_ref())
.ok_or(ValidationError("no content"))?;
if content.len() > CONTENT_MAX_SIZE {
return Err(ValidationError("content is too long"));
};