use crate::{
check_apub_id_valid_with_strictness,
- fetch_local_site_data,
- local_instance,
objects::read_from_string_or_source,
protocol::{
objects::chat_message::{ChatMessage, ChatMessageType},
},
};
use activitypub_federation::{
- core::object_id::ObjectId,
- deser::values::MediaTypeHtml,
- traits::ApubObject,
- utils::verify_domains_match,
+ config::Data,
+ protocol::{values::MediaTypeHtml, verification::verify_domains_match},
+ traits::Object,
};
use chrono::NaiveDateTime;
-use lemmy_api_common::utils::{blocking, check_person_block};
+use lemmy_api_common::{
+ context::LemmyContext,
+ utils::{check_person_block, sanitize_html},
+};
use lemmy_db_schema::{
source::{
person::Person,
traits::Crud,
};
use lemmy_utils::{
- error::LemmyError,
- utils::{convert_datetime, markdown_to_html},
+ error::{LemmyError, LemmyErrorType},
+ utils::{markdown::markdown_to_html, time::convert_datetime},
};
-use lemmy_websocket::LemmyContext;
use std::ops::Deref;
use url::Url;
#[derive(Clone, Debug)]
-pub struct ApubPrivateMessage(PrivateMessage);
+pub struct ApubPrivateMessage(pub(crate) PrivateMessage);
impl Deref for ApubPrivateMessage {
type Target = PrivateMessage;
}
}
-#[async_trait::async_trait(?Send)]
-impl ApubObject for ApubPrivateMessage {
+#[async_trait::async_trait]
+impl Object for ApubPrivateMessage {
type DataType = LemmyContext;
- type ApubType = ChatMessage;
- type DbType = PrivateMessage;
+ type Kind = ChatMessage;
type Error = LemmyError;
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
}
#[tracing::instrument(skip_all)]
- async fn read_from_apub_id(
+ async fn read_from_id(
object_id: Url,
- context: &LemmyContext,
+ context: &Data<Self::DataType>,
) -> Result<Option<Self>, LemmyError> {
Ok(
- blocking(context.pool(), move |conn| {
- PrivateMessage::read_from_apub_id(conn, object_id)
- })
- .await??
- .map(Into::into),
+ PrivateMessage::read_from_apub_id(&mut context.pool(), object_id)
+ .await?
+ .map(Into::into),
)
}
- async fn delete(self, _context: &LemmyContext) -> Result<(), LemmyError> {
+ 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_apub(self, context: &LemmyContext) -> Result<ChatMessage, LemmyError> {
+ async fn into_json(self, context: &Data<Self::DataType>) -> Result<ChatMessage, LemmyError> {
let creator_id = self.creator_id;
- let creator = blocking(context.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(context.pool(), move |conn| Person::read(conn, recipient_id)).await??;
+ let recipient = Person::read(&mut context.pool(), recipient_id).await?;
let note = ChatMessage {
r#type: ChatMessageType::ChatMessage,
- id: ObjectId::new(self.ap_id.clone()),
- attributed_to: ObjectId::new(creator.actor_id),
- to: [ObjectId::new(recipient.actor_id)],
+ 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())),
async fn verify(
note: &ChatMessage,
expected_domain: &Url,
- context: &LemmyContext,
- request_counter: &mut i32,
+ context: &Data<Self::DataType>,
) -> Result<(), LemmyError> {
verify_domains_match(note.id.inner(), expected_domain)?;
verify_domains_match(note.attributed_to.inner(), note.id.inner())?;
- let local_site_data = blocking(context.pool(), fetch_local_site_data).await??;
-
- check_apub_id_valid_with_strictness(
- note.id.inner(),
- false,
- &local_site_data,
- context.settings(),
- )?;
- let person = note
- .attributed_to
- .dereference(context, local_instance(context), request_counter)
- .await?;
+ 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(LemmyError::from_message("Person is banned from site"));
+ return Err(LemmyErrorType::PersonIsBannedFromSite(
+ person.actor_id.to_string(),
+ ))?;
}
Ok(())
}
#[tracing::instrument(skip_all)]
- async fn from_apub(
+ async fn from_json(
note: ChatMessage,
- context: &LemmyContext,
- request_counter: &mut i32,
+ context: &Data<Self::DataType>,
) -> Result<ApubPrivateMessage, LemmyError> {
- let creator = note
- .attributed_to
- .dereference(context, local_instance(context), request_counter)
- .await?;
- let recipient = note.to[0]
- .dereference(context, local_instance(context), request_counter)
- .await?;
- check_person_block(creator.id, recipient.id, context.pool()).await?;
+ 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?;
+
+ let content = read_from_string_or_source(¬e.content, &None, ¬e.source);
+ let content = sanitize_html(&content);
let form = PrivateMessageInsertForm {
creator_id: creator.id,
recipient_id: recipient.id,
- content: read_from_string_or_source(¬e.content, &None, ¬e.source),
+ content,
published: note.published.map(|u| u.naive_local()),
updated: note.updated.map(|u| u.naive_local()),
- deleted: None,
+ deleted: Some(false),
read: None,
ap_id: Some(note.id.into()),
local: Some(false),
};
- let pm = blocking(context.pool(), move |conn| {
- PrivateMessage::create(conn, &form)
- })
- .await??;
+ 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::{
async fn prepare_comment_test(
url: &Url,
- context: &LemmyContext,
+ 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(context).await;
- ApubPerson::verify(&lemmy_person, url, context, &mut 0)
+ let site = parse_lemmy_instance(&context2).await;
+ ApubPerson::verify(&lemmy_person, url, &context2)
.await
.unwrap();
- let person1 = ApubPerson::from_apub(lemmy_person, context, &mut 0)
+ 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, context, &mut 0)
+ ApubPerson::verify(&pleroma_person, &pleroma_url, &context2)
.await
.unwrap();
- let person2 = ApubPerson::from_apub(pleroma_person, context, &mut 0)
+ let person2 = ApubPerson::from_json(pleroma_person, &context2)
.await
.unwrap();
(person1, person2, site)
}
- fn cleanup(data: (ApubPerson, ApubPerson, ApubSite), context: &LemmyContext) {
- let conn = &mut context.pool().get().unwrap();
- Person::delete(conn, data.0.id).unwrap();
- Person::delete(conn, data.1.id).unwrap();
- Site::delete(conn, data.2.id).unwrap();
+ 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();
}
- #[actix_rt::test]
+ #[tokio::test]
#[serial]
async fn test_parse_lemmy_pm() {
- let context = init_context();
- let conn = &mut context.pool().get().unwrap();
+ 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();
- let mut request_counter = 0;
- ApubPrivateMessage::verify(&json, &url, &context, &mut request_counter)
+ ApubPrivateMessage::verify(&json, &url, &context)
.await
.unwrap();
- let pm = ApubPrivateMessage::from_apub(json.clone(), &context, &mut request_counter)
+ 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!(request_counter, 0);
+ assert_eq!(context.request_count(), 0);
let pm_id = pm.id;
- let to_apub = pm.into_apub(&context).await.unwrap();
+ let to_apub = pm.into_json(&context).await.unwrap();
assert_json_include!(actual: json, expected: to_apub);
- PrivateMessage::delete(conn, pm_id).unwrap();
- cleanup(data, &context);
+ PrivateMessage::delete(&mut context.pool(), pm_id)
+ .await
+ .unwrap();
+ cleanup(data, &context).await;
}
- #[actix_rt::test]
+ #[tokio::test]
#[serial]
async fn test_parse_pleroma_pm() {
- let context = init_context();
- let conn = &mut context.pool().get().unwrap();
+ 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();
- let mut request_counter = 0;
- ApubPrivateMessage::verify(&json, &pleroma_url, &context, &mut request_counter)
- .await
- .unwrap();
- let pm = ApubPrivateMessage::from_apub(json, &context, &mut request_counter)
+ 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!(request_counter, 0);
+ assert_eq!(context.request_count(), 0);
- PrivateMessage::delete(conn, pm.id).unwrap();
- cleanup(data, &context);
+ PrivateMessage::delete(&mut context.pool(), pm.id)
+ .await
+ .unwrap();
+ cleanup(data, &context).await;
}
}
projects / lemmy.git / blobdiff