use crate::{
+ fetcher::user_or_community::{PersonOrGroupType, UserOrCommunity},
+ local_instance,
objects::{community::ApubCommunity, person::ApubPerson, post::ApubPost},
- protocol::{ImageObject, Source},
+ protocol::{objects::LanguageTag, ImageObject, Source},
};
-use activitystreams_kinds::link::LinkType;
-use chrono::{DateTime, FixedOffset};
-use itertools::Itertools;
-use lemmy_apub_lib::{
+use activitypub_federation::{
+ core::object_id::ObjectId,
data::Data,
- object_id::ObjectId,
+ deser::{
+ helpers::{deserialize_one_or_many, deserialize_skip_error},
+ values::MediaTypeMarkdownOrHtml,
+ },
traits::{ActivityHandler, ApubObject},
- values::MediaTypeHtml,
};
+use activitystreams_kinds::{link::LinkType, object::ImageType};
+use chrono::{DateTime, FixedOffset};
+use itertools::Itertools;
use lemmy_db_schema::newtypes::DbUrl;
-use lemmy_utils::LemmyError;
+use lemmy_utils::error::LemmyError;
use lemmy_websocket::LemmyContext;
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none;
use url::Url;
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
pub enum PageType {
Page,
Article,
Note,
+ Video,
}
#[skip_serializing_none]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct Page {
- pub(crate) r#type: PageType,
+ #[serde(rename = "type")]
+ pub(crate) kind: PageType,
pub(crate) id: ObjectId<ApubPost>,
- pub(crate) attributed_to: ObjectId<ApubPerson>,
- #[serde(deserialize_with = "crate::deserialize_one_or_many")]
+ pub(crate) attributed_to: AttributedTo,
+ #[serde(deserialize_with = "deserialize_one_or_many")]
pub(crate) to: Vec<Url>,
pub(crate) name: String,
- #[serde(default)]
- #[serde(deserialize_with = "crate::deserialize_one_or_many")]
+ #[serde(deserialize_with = "deserialize_one_or_many", default)]
pub(crate) cc: Vec<Url>,
pub(crate) content: Option<String>,
- pub(crate) media_type: Option<MediaTypeHtml>,
- #[serde(default)]
- #[serde(deserialize_with = "crate::deserialize_skip_error")]
+ pub(crate) media_type: Option<MediaTypeMarkdownOrHtml>,
+ #[serde(deserialize_with = "deserialize_skip_error", default)]
pub(crate) source: Option<Source>,
/// deprecated, use attachment field
+ #[serde(deserialize_with = "deserialize_skip_error", default)]
pub(crate) url: Option<Url>,
/// most software uses array type for attachment field, so we do the same. nevertheless, we only
/// use the first item
pub(crate) stickied: Option<bool>,
pub(crate) published: Option<DateTime<FixedOffset>>,
pub(crate) updated: Option<DateTime<FixedOffset>>,
+ pub(crate) language: Option<LanguageTag>,
}
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
-pub struct Attachment {
+pub(crate) struct Link {
pub(crate) href: Url,
pub(crate) r#type: LinkType,
}
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct Image {
+ #[serde(rename = "type")]
+ pub(crate) kind: ImageType,
+ pub(crate) url: Url,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(untagged)]
+pub(crate) enum Attachment {
+ Link(Link),
+ Image(Image),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(untagged)]
+pub(crate) enum AttributedTo {
+ Lemmy(ObjectId<ApubPerson>),
+ Peertube([AttributedToPeertube; 2]),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AttributedToPeertube {
+ #[serde(rename = "type")]
+ pub kind: PersonOrGroupType,
+ pub id: ObjectId<UserOrCommunity>,
+}
+
impl Page {
/// Only mods can change the post's stickied/locked status. So if either of these is changed from
/// the current value, it is a mod action and needs to be verified as such.
.dereference_local(context)
.await;
- let is_mod_action = if let Ok(old_post) = old_post {
- self.stickied != Some(old_post.stickied) || self.comments_enabled != Some(!old_post.locked)
- } else {
- false
- };
- Ok(is_mod_action)
+ let stickied_changed = Page::is_stickied_changed(&old_post, &self.stickied);
+ let locked_changed = Page::is_locked_changed(&old_post, &self.comments_enabled);
+ Ok(stickied_changed || locked_changed)
+ }
+
+ pub(crate) fn is_stickied_changed<E>(
+ old_post: &Result<ApubPost, E>,
+ new_stickied: &Option<bool>,
+ ) -> bool {
+ if let Some(new_stickied) = new_stickied {
+ if let Ok(old_post) = old_post {
+ return new_stickied != &old_post.stickied;
+ }
+ }
+
+ false
+ }
+
+ pub(crate) fn is_locked_changed<E>(
+ old_post: &Result<ApubPost, E>,
+ new_comments_enabled: &Option<bool>,
+ ) -> bool {
+ if let Some(new_comments_enabled) = new_comments_enabled {
+ if let Ok(old_post) = old_post {
+ return new_comments_enabled != &!old_post.locked;
+ }
+ }
+
+ false
}
pub(crate) async fn extract_community(
context: &LemmyContext,
request_counter: &mut i32,
) -> Result<ApubCommunity, LemmyError> {
- let mut iter = self.to.iter().merge(self.cc.iter());
- loop {
- if let Some(cid) = iter.next() {
- let cid = ObjectId::new(cid.clone());
- if let Ok(c) = cid
- .dereference(context, context.client(), request_counter)
- .await
- {
- break Ok(c);
+ match &self.attributed_to {
+ AttributedTo::Lemmy(_) => {
+ let mut iter = self.to.iter().merge(self.cc.iter());
+ loop {
+ if let Some(cid) = iter.next() {
+ let cid = ObjectId::new(cid.clone());
+ if let Ok(c) = cid
+ .dereference(context, local_instance(context), request_counter)
+ .await
+ {
+ break Ok(c);
+ }
+ } else {
+ return Err(LemmyError::from_message("No community found in cc"));
+ }
}
- } else {
- return Err(LemmyError::from_message("No community found in cc"));
}
+ AttributedTo::Peertube(p) => {
+ p.iter()
+ .find(|a| a.kind == PersonOrGroupType::Group)
+ .map(|a| ObjectId::<ApubCommunity>::new(a.id.clone().into_inner()))
+ .ok_or_else(|| LemmyError::from_message("page does not specify group"))?
+ .dereference(context, local_instance(context), request_counter)
+ .await
+ }
+ }
+ }
+
+ pub(crate) fn creator(&self) -> Result<ObjectId<ApubPerson>, LemmyError> {
+ match &self.attributed_to {
+ AttributedTo::Lemmy(l) => Ok(l.clone()),
+ AttributedTo::Peertube(p) => p
+ .iter()
+ .find(|a| a.kind == PersonOrGroupType::Person)
+ .map(|a| ObjectId::<ApubPerson>::new(a.id.clone().into_inner()))
+ .ok_or_else(|| LemmyError::from_message("page does not specify creator person")),
}
}
}
impl Attachment {
pub(crate) fn new(url: DbUrl) -> Attachment {
- Attachment {
+ Attachment::Link(Link {
href: url.into(),
r#type: Default::default(),
- }
+ })
}
}
#[async_trait::async_trait(?Send)]
impl ActivityHandler for Page {
type DataType = LemmyContext;
+ type Error = LemmyError;
+ fn id(&self) -> &Url {
+ unimplemented!()
+ }
+ fn actor(&self) -> &Url {
+ unimplemented!()
+ }
async fn verify(
&self,
data: &Data<Self::DataType>,
projects / lemmy.git / blobdiff