use crate::{
- check_is_apub_id_valid,
+ check_apub_id_valid_with_strictness,
generate_outbox_url,
- objects::{get_summary_from_string_or_source, instance::fetch_instance_actor_for_object},
+ objects::{instance::fetch_instance_actor_for_object, read_from_string_or_source_opt},
protocol::{
objects::{
person::{Person, UserTypes},
ImageObject,
Source,
},
+ ActorType,
};
-use chrono::NaiveDateTime;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
- object_id::ObjectId,
- traits::{ActorType, ApubObject},
- verify::verify_domains_match,
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ traits::{Actor, ApubObject},
+ utils::verify_domains_match,
};
+use chrono::NaiveDateTime;
+use lemmy_api_common::utils::blocking;
use lemmy_db_schema::{
- naive_now,
source::person::{Person as DbPerson, PersonForm},
traits::ApubActor,
+ utils::naive_now,
};
use lemmy_utils::{
+ error::LemmyError,
utils::{check_slurs, check_slurs_opt, convert_datetime, markdown_to_html},
- LemmyError,
};
use lemmy_websocket::LemmyContext;
use std::ops::Deref;
use url::Url;
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
pub struct ApubPerson(DbPerson);
impl Deref for ApubPerson {
impl From<DbPerson> for ApubPerson {
fn from(p: DbPerson) -> Self {
- ApubPerson { 0: p }
+ ApubPerson(p)
}
}
impl ApubObject for ApubPerson {
type DataType = LemmyContext;
type ApubType = Person;
- type TombstoneType = ();
+ type DbType = DbPerson;
+ type Error = LemmyError;
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
Some(self.last_refreshed_at)
) -> Result<Option<Self>, LemmyError> {
Ok(
blocking(context.pool(), move |conn| {
- DbPerson::read_from_apub_id(conn, object_id)
+ DbPerson::read_from_apub_id(conn, &object_id.into())
})
.await??
.map(Into::into),
endpoints: self.shared_inbox_url.clone().map(|s| Endpoints {
shared_inbox: s.into(),
}),
- public_key: self.get_public_key()?,
+ public_key: self.get_public_key(),
updated: self.updated.map(convert_datetime),
- unparsed: Default::default(),
inbox: self.inbox_url.clone().into(),
};
Ok(person)
}
- fn to_tombstone(&self) -> Result<(), LemmyError> {
- unimplemented!()
- }
-
#[tracing::instrument(skip_all)]
async fn verify(
person: &Person,
_request_counter: &mut i32,
) -> Result<(), LemmyError> {
verify_domains_match(person.id.inner(), expected_domain)?;
- check_is_apub_id_valid(person.id.inner(), false, &context.settings())?;
+ check_apub_id_valid_with_strictness(person.id.inner(), false, context.settings())?;
let slur_regex = &context.settings().slur_regex();
check_slurs(&person.preferred_username, slur_regex)?;
check_slurs_opt(&person.name, slur_regex)?;
- let bio = get_summary_from_string_or_source(&person.summary, &person.source);
+ let bio = read_from_string_or_source_opt(&person.summary, &None, &person.source);
check_slurs_opt(&bio, slur_regex)?;
Ok(())
}
published: person.published.map(|u| u.naive_local()),
updated: person.updated.map(|u| u.naive_local()),
actor_id: Some(person.id.into()),
- bio: Some(get_summary_from_string_or_source(
+ bio: Some(read_from_string_or_source_opt(
&person.summary,
+ &None,
&person.source,
)),
local: Some(false),
admin: Some(false),
bot_account: Some(person.kind == UserTypes::Service),
private_key: None,
- public_key: person.public_key.public_key_pem,
+ public_key: Some(person.public_key.public_key_pem),
last_refreshed_at: Some(naive_now()),
inbox_url: Some(person.inbox.into()),
shared_inbox_url: Some(person.endpoints.map(|e| e.shared_inbox.into())),
self.actor_id.to_owned().into()
}
- fn public_key(&self) -> String {
- self.public_key.to_owned()
- }
-
fn private_key(&self) -> Option<String> {
self.private_key.to_owned()
}
+}
+
+impl Actor for ApubPerson {
+ fn public_key(&self) -> &str {
+ &self.public_key
+ }
- fn inbox_url(&self) -> Url {
+ fn inbox(&self) -> Url {
self.inbox_url.clone().into()
}
- fn shared_inbox_url(&self) -> Option<Url> {
+ fn shared_inbox(&self) -> Option<Url> {
self.shared_inbox_url.clone().map(|s| s.into())
}
}
use crate::{
objects::{
instance::{tests::parse_lemmy_instance, ApubSite},
- tests::{file_to_json_object, init_context},
+ tests::init_context,
},
- protocol::objects::instance::Instance,
+ protocol::{objects::instance::Instance, tests::file_to_json_object},
};
- use lemmy_apub_lib::activity_queue::create_activity_queue;
use lemmy_db_schema::{source::site::Site, traits::Crud};
use serial_test::serial;
#[actix_rt::test]
#[serial]
async fn test_parse_lemmy_person() {
- let client = reqwest::Client::new().into();
- let manager = create_activity_queue(client);
- let context = init_context(manager.queue_handle().clone());
+ let context = init_context();
+ let conn = &mut context.pool().get().unwrap();
let (person, site) = parse_lemmy_person(&context).await;
assert_eq!(person.display_name, Some("Jean-Luc Picard".to_string()));
assert!(!person.local);
assert_eq!(person.bio.as_ref().unwrap().len(), 39);
- DbPerson::delete(&*context.pool().get().unwrap(), person.id).unwrap();
- Site::delete(&*context.pool().get().unwrap(), site.id).unwrap();
+ DbPerson::delete(conn, person.id).unwrap();
+ Site::delete(conn, site.id).unwrap();
}
#[actix_rt::test]
#[serial]
async fn test_parse_pleroma_person() {
- let client = reqwest::Client::new().into();
- let manager = create_activity_queue(client);
- let context = init_context(manager.queue_handle().clone());
+ let context = init_context();
+ let conn = &mut context.pool().get().unwrap();
// create and parse a fake pleroma instance actor, to avoid network request during test
let mut json: Instance = file_to_json_object("assets/lemmy/objects/instance.json").unwrap();
assert_eq!(request_counter, 0);
assert_eq!(person.bio.as_ref().unwrap().len(), 873);
- DbPerson::delete(&*context.pool().get().unwrap(), person.id).unwrap();
- Site::delete(&*context.pool().get().unwrap(), site.id).unwrap();
+ DbPerson::delete(conn, person.id).unwrap();
+ Site::delete(conn, site.id).unwrap();
}
}
projects / lemmy.git / blobdiff