ActorType,
};
use activitypub_federation::{
- core::{inbox::ActorPublicKey, object_id::ObjectId},
- traits::ApubObject,
+ core::object_id::ObjectId,
+ traits::{Actor, ApubObject},
};
use activitystreams_kinds::actor::GroupType;
use chrono::NaiveDateTime;
group
.outbox
- .dereference::<LemmyError>(&outbox_data, local_instance(context), request_counter)
+ .dereference(&outbox_data, local_instance(context), request_counter)
.await
.map_err(|e| debug!("{}", e))
.ok();
if let Some(moderators) = &group.moderators {
moderators
- .dereference::<LemmyError>(&outbox_data, local_instance(context), request_counter)
+ .dereference(&outbox_data, local_instance(context), request_counter)
.await
.map_err(|e| debug!("{}", e))
.ok();
}
}
-impl ActorType for ApubCommunity {
- fn actor_id(&self) -> Url {
- self.actor_id.to_owned().into()
- }
- fn private_key(&self) -> Option<String> {
- self.private_key.to_owned()
+impl Actor for ApubCommunity {
+ 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())
}
}
-impl ActorPublicKey for ApubCommunity {
- fn public_key(&self) -> &str {
- &self.public_key
+impl ActorType for ApubCommunity {
+ fn actor_id(&self) -> Url {
+ self.actor_id.to_owned().into()
+ }
+ fn private_key(&self) -> Option<String> {
+ self.private_key.to_owned()
}
}
.unique()
.filter(|inbox: &Url| inbox.host_str() != Some(&context.settings().hostname))
// Don't send to blocked instances
- .filter(|inbox| {
- check_apub_id_valid_with_strictness(inbox, false, &context.settings()).is_ok()
- })
+ .filter(|inbox| check_apub_id_valid_with_strictness(inbox, false, context.settings()).is_ok())
.collect();
Ok(inboxes)
#[serial]
async fn test_parse_lemmy_community() {
let context = init_context();
+ let conn = &mut context.pool().get().unwrap();
let site = parse_lemmy_instance(&context).await;
let community = parse_lemmy_community(&context).await;
assert!(!community.local);
assert_eq!(community.description.as_ref().unwrap().len(), 132);
- Community::delete(&*context.pool().get().unwrap(), community.id).unwrap();
- Site::delete(&*context.pool().get().unwrap(), site.id).unwrap();
+ Community::delete(conn, community.id).unwrap();
+ Site::delete(conn, site.id).unwrap();
}
}