ActorType,
};
use activitypub_federation::{
- core::{inbox::ActorPublicKey, object_id::ObjectId},
- traits::ApubObject,
+ core::object_id::ObjectId,
+ traits::{Actor, ApubObject},
utils::verify_domains_match,
};
use chrono::NaiveDateTime;
use std::ops::Deref;
use url::Url;
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
pub struct ApubPerson(DbPerson);
impl Deref for ApubPerson {
_request_counter: &mut i32,
) -> Result<(), LemmyError> {
verify_domains_match(person.id.inner(), expected_domain)?;
- check_apub_id_valid_with_strictness(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)?;
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())),
fn private_key(&self) -> Option<String> {
self.private_key.to_owned()
}
+}
- fn inbox_url(&self) -> Url {
- self.inbox_url.clone().into()
+impl Actor for ApubPerson {
+ fn public_key(&self) -> &str {
+ &self.public_key
}
- fn shared_inbox_url(&self) -> Option<Url> {
- self.shared_inbox_url.clone().map(|s| s.into())
+ fn inbox(&self) -> Url {
+ self.inbox_url.clone().into()
}
-}
-impl ActorPublicKey for ApubPerson {
- fn public_key(&self) -> &str {
- &self.public_key
+ fn shared_inbox(&self) -> Option<Url> {
+ self.shared_inbox_url.clone().map(|s| s.into())
}
}
#[serial]
async fn test_parse_lemmy_person() {
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 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();
}
}