X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fobjects%2Fprivate_message.rs;h=9a92b0b5197f0bad2af93bef2e0c4b7bb8e30b0a;hb=ee7b35a04af4a200e25893249d8a32d4ceeea2b0;hp=5502fc355e2363c2c24cd73df397c2971789c9fa;hpb=4c8f2e976effe381d4ea1914462c43242a8c64fd;p=lemmy.git

diff --git a/crates/apub/src/objects/private_message.rs b/crates/apub/src/objects/private_message.rs
index 5502fc35..9a92b0b5 100644
--- a/crates/apub/src/objects/private_message.rs
+++ b/crates/apub/src/objects/private_message.rs
@@ -1,136 +1,247 @@
 use crate::{
-  check_is_apub_id_valid,
-  extensions::context::lemmy_context,
-  fetcher::person::get_or_fetch_and_upsert_person,
-  objects::{
-    check_object_domain,
-    create_tombstone,
-    get_object_from_apub,
-    get_source_markdown_value,
-    set_content_and_source,
-    FromApub,
-    FromApubToForm,
-    ToApub,
+  check_apub_id_valid_with_strictness,
+  objects::read_from_string_or_source,
+  protocol::{
+    objects::chat_message::{ChatMessage, ChatMessageType},
+    Source,
   },
-  NoteExt,
 };
-use activitystreams::{
-  object::{kind::NoteType, ApObject, Note, Tombstone},
-  prelude::*,
+use activitypub_federation::{
+  config::Data,
+  protocol::{values::MediaTypeHtml, verification::verify_domains_match},
+  traits::Object,
 };
-use anyhow::Context;
-use lemmy_api_common::blocking;
-use lemmy_db_queries::{Crud, DbPool};
-use lemmy_db_schema::source::{
-  person::Person,
-  private_message::{PrivateMessage, PrivateMessageForm},
+use chrono::NaiveDateTime;
+use lemmy_api_common::{
+  context::LemmyContext,
+  utils::{check_person_block, sanitize_html},
 };
-use lemmy_utils::{location_info, utils::convert_datetime, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_schema::{
+  source::{
+    person::Person,
+    private_message::{PrivateMessage, PrivateMessageInsertForm},
+  },
+  traits::Crud,
+};
+use lemmy_utils::{
+  error::{LemmyError, LemmyErrorType},
+  utils::{markdown::markdown_to_html, time::convert_datetime},
+};
+use std::ops::Deref;
 use url::Url;
 
-#[async_trait::async_trait(?Send)]
-impl ToApub for PrivateMessage {
-  type ApubType = NoteExt;
+#[derive(Clone, Debug)]
+pub struct ApubPrivateMessage(pub(crate) PrivateMessage);
+
+impl Deref for ApubPrivateMessage {
+  type Target = PrivateMessage;
+  fn deref(&self) -> &Self::Target {
+    &self.0
+  }
+}
+
+impl From<PrivateMessage> for ApubPrivateMessage {
+  fn from(pm: PrivateMessage) -> Self {
+    ApubPrivateMessage(pm)
+  }
+}
+
+#[async_trait::async_trait]
+impl Object for ApubPrivateMessage {
+  type DataType = LemmyContext;
+  type Kind = ChatMessage;
+  type Error = LemmyError;
 
-  async fn to_apub(&self, pool: &DbPool) -> Result<NoteExt, LemmyError> {
-    let mut private_message = ApObject::new(Note::new());
+  fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
+    None
+  }
+
+  #[tracing::instrument(skip_all)]
+  async fn read_from_id(
+    object_id: Url,
+    context: &Data<Self::DataType>,
+  ) -> Result<Option<Self>, LemmyError> {
+    Ok(
+      PrivateMessage::read_from_apub_id(&mut context.pool(), object_id)
+        .await?
+        .map(Into::into),
+    )
+  }
+
+  async fn delete(self, _context: &Data<Self::DataType>) -> Result<(), LemmyError> {
+    // do nothing, because pm can't be fetched over http
+    unimplemented!()
+  }
 
+  #[tracing::instrument(skip_all)]
+  async fn into_json(self, context: &Data<Self::DataType>) -> Result<ChatMessage, LemmyError> {
     let creator_id = self.creator_id;
-    let creator = blocking(pool, move |conn| Person::read(conn, creator_id)).await??;
+    let creator = Person::read(&mut context.pool(), creator_id).await?;
 
     let recipient_id = self.recipient_id;
-    let recipient = blocking(pool, move |conn| Person::read(conn, recipient_id)).await??;
+    let recipient = Person::read(&mut context.pool(), recipient_id).await?;
 
-    private_message
-      .set_many_contexts(lemmy_context()?)
-      .set_id(self.ap_id.to_owned().into_inner())
-      .set_published(convert_datetime(self.published))
-      .set_to(recipient.actor_id.into_inner())
-      .set_attributed_to(creator.actor_id.into_inner());
+    let note = ChatMessage {
+      r#type: ChatMessageType::ChatMessage,
+      id: self.ap_id.clone().into(),
+      attributed_to: creator.actor_id.into(),
+      to: [recipient.actor_id.into()],
+      content: markdown_to_html(&self.content),
+      media_type: Some(MediaTypeHtml::Html),
+      source: Some(Source::new(self.content.clone())),
+      published: Some(convert_datetime(self.published)),
+      updated: self.updated.map(convert_datetime),
+    };
+    Ok(note)
+  }
 
-    set_content_and_source(&mut private_message, &self.content)?;
+  #[tracing::instrument(skip_all)]
+  async fn verify(
+    note: &ChatMessage,
+    expected_domain: &Url,
+    context: &Data<Self::DataType>,
+  ) -> Result<(), LemmyError> {
+    verify_domains_match(note.id.inner(), expected_domain)?;
+    verify_domains_match(note.attributed_to.inner(), note.id.inner())?;
 
-    if let Some(u) = self.updated {
-      private_message.set_updated(convert_datetime(u));
+    check_apub_id_valid_with_strictness(note.id.inner(), false, context).await?;
+    let person = note.attributed_to.dereference(context).await?;
+    if person.banned {
+      return Err(LemmyErrorType::PersonIsBannedFromSite(
+        person.actor_id.to_string(),
+      ))?;
     }
-
-    Ok(private_message)
+    Ok(())
   }
 
-  fn to_tombstone(&self) -> Result<Tombstone, LemmyError> {
-    create_tombstone(
-      self.deleted,
-      self.ap_id.to_owned().into(),
-      self.updated,
-      NoteType::Note,
-    )
-  }
-}
+  #[tracing::instrument(skip_all)]
+  async fn from_json(
+    note: ChatMessage,
+    context: &Data<Self::DataType>,
+  ) -> Result<ApubPrivateMessage, LemmyError> {
+    let creator = note.attributed_to.dereference(context).await?;
+    let recipient = note.to[0].dereference(context).await?;
+    check_person_block(creator.id, recipient.id, &mut context.pool()).await?;
 
-#[async_trait::async_trait(?Send)]
-impl FromApub for PrivateMessage {
-  type ApubType = NoteExt;
-
-  async fn from_apub(
-    note: &NoteExt,
-    context: &LemmyContext,
-    expected_domain: Url,
-    request_counter: &mut i32,
-    mod_action_allowed: bool,
-  ) -> Result<PrivateMessage, LemmyError> {
-    get_object_from_apub(
-      note,
-      context,
-      expected_domain,
-      request_counter,
-      mod_action_allowed,
-    )
-    .await
-  }
-}
+    let content = read_from_string_or_source(&note.content, &None, &note.source);
+    let content = sanitize_html(&content);
 
-#[async_trait::async_trait(?Send)]
-impl FromApubToForm<NoteExt> for PrivateMessageForm {
-  async fn from_apub(
-    note: &NoteExt,
-    context: &LemmyContext,
-    expected_domain: Url,
-    request_counter: &mut i32,
-    _mod_action_allowed: bool,
-  ) -> Result<PrivateMessageForm, LemmyError> {
-    let creator_actor_id = note
-      .attributed_to()
-      .context(location_info!())?
-      .clone()
-      .single_xsd_any_uri()
-      .context(location_info!())?;
-
-    let creator =
-      get_or_fetch_and_upsert_person(&creator_actor_id, context, request_counter).await?;
-    let recipient_actor_id = note
-      .to()
-      .context(location_info!())?
-      .clone()
-      .single_xsd_any_uri()
-      .context(location_info!())?;
-    let recipient =
-      get_or_fetch_and_upsert_person(&recipient_actor_id, context, request_counter).await?;
-    let ap_id = note.id_unchecked().context(location_info!())?.to_string();
-    check_is_apub_id_valid(&Url::parse(&ap_id)?)?;
-
-    let content = get_source_markdown_value(note)?.context(location_info!())?;
-
-    Ok(PrivateMessageForm {
+    let form = PrivateMessageInsertForm {
       creator_id: creator.id,
       recipient_id: recipient.id,
       content,
-      published: note.published().map(|u| u.to_owned().naive_local()),
-      updated: note.updated().map(|u| u.to_owned().naive_local()),
-      deleted: None,
+      published: note.published.map(|u| u.naive_local()),
+      updated: note.updated.map(|u| u.naive_local()),
+      deleted: Some(false),
       read: None,
-      ap_id: Some(check_object_domain(note, expected_domain)?),
+      ap_id: Some(note.id.into()),
       local: Some(false),
-    })
+    };
+    let pm = PrivateMessage::create(&mut context.pool(), &form).await?;
+    Ok(pm.into())
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
+  use super::*;
+  use crate::{
+    objects::{
+      instance::{tests::parse_lemmy_instance, ApubSite},
+      person::ApubPerson,
+      tests::init_context,
+    },
+    protocol::tests::file_to_json_object,
+  };
+  use assert_json_diff::assert_json_include;
+  use lemmy_db_schema::source::site::Site;
+  use serial_test::serial;
+
+  async fn prepare_comment_test(
+    url: &Url,
+    context: &Data<LemmyContext>,
+  ) -> (ApubPerson, ApubPerson, ApubSite) {
+    let context2 = context.reset_request_count();
+    let lemmy_person = file_to_json_object("assets/lemmy/objects/person.json").unwrap();
+    let site = parse_lemmy_instance(&context2).await;
+    ApubPerson::verify(&lemmy_person, url, &context2)
+      .await
+      .unwrap();
+    let person1 = ApubPerson::from_json(lemmy_person, &context2)
+      .await
+      .unwrap();
+    let pleroma_person = file_to_json_object("assets/pleroma/objects/person.json").unwrap();
+    let pleroma_url = Url::parse("https://queer.hacktivis.me/users/lanodan").unwrap();
+    ApubPerson::verify(&pleroma_person, &pleroma_url, &context2)
+      .await
+      .unwrap();
+    let person2 = ApubPerson::from_json(pleroma_person, &context2)
+      .await
+      .unwrap();
+    (person1, person2, site)
+  }
+
+  async fn cleanup(data: (ApubPerson, ApubPerson, ApubSite), context: &Data<LemmyContext>) {
+    Person::delete(&mut context.pool(), data.0.id)
+      .await
+      .unwrap();
+    Person::delete(&mut context.pool(), data.1.id)
+      .await
+      .unwrap();
+    Site::delete(&mut context.pool(), data.2.id).await.unwrap();
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn test_parse_lemmy_pm() {
+    let context = init_context().await;
+    let url = Url::parse("https://enterprise.lemmy.ml/private_message/1621").unwrap();
+    let data = prepare_comment_test(&url, &context).await;
+    let json: ChatMessage = file_to_json_object("assets/lemmy/objects/chat_message.json").unwrap();
+    ApubPrivateMessage::verify(&json, &url, &context)
+      .await
+      .unwrap();
+    let pm = ApubPrivateMessage::from_json(json.clone(), &context)
+      .await
+      .unwrap();
+
+    assert_eq!(pm.ap_id.clone(), url.into());
+    assert_eq!(pm.content.len(), 20);
+    assert_eq!(context.request_count(), 0);
+
+    let pm_id = pm.id;
+    let to_apub = pm.into_json(&context).await.unwrap();
+    assert_json_include!(actual: json, expected: to_apub);
+
+    PrivateMessage::delete(&mut context.pool(), pm_id)
+      .await
+      .unwrap();
+    cleanup(data, &context).await;
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn test_parse_pleroma_pm() {
+    let context = init_context().await;
+    let url = Url::parse("https://enterprise.lemmy.ml/private_message/1621").unwrap();
+    let data = prepare_comment_test(&url, &context).await;
+    let pleroma_url = Url::parse("https://queer.hacktivis.me/objects/2").unwrap();
+    let json = file_to_json_object("assets/pleroma/objects/chat_message.json").unwrap();
+    ApubPrivateMessage::verify(&json, &pleroma_url, &context)
+      .await
+      .unwrap();
+    let pm = ApubPrivateMessage::from_json(json, &context).await.unwrap();
+
+    assert_eq!(pm.ap_id, pleroma_url.into());
+    assert_eq!(pm.content.len(), 3);
+    assert_eq!(context.request_count(), 0);
+
+    PrivateMessage::delete(&mut context.pool(), pm.id)
+      .await
+      .unwrap();
+    cleanup(data, &context).await;
   }
 }