use crate::{
- check_is_apub_id_valid,
+ check_apub_id_valid_with_strictness,
collections::{community_moderators::ApubCommunityModerators, CommunityContext},
generate_moderators_url,
generate_outbox_url,
+ local_instance,
+ objects::instance::fetch_instance_actor_for_object,
protocol::{
- objects::{group::Group, tombstone::Tombstone, Endpoints},
+ objects::{group::Group, Endpoints},
ImageObject,
Source,
},
+ ActorType,
+};
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ traits::{Actor, ApubObject},
};
use activitystreams_kinds::actor::GroupType;
use chrono::NaiveDateTime;
use itertools::Itertools;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
- object_id::ObjectId,
- traits::{ActorType, ApubObject},
- values::MediaTypeMarkdown,
-};
+use lemmy_api_common::utils::blocking;
use lemmy_db_schema::{source::community::Community, traits::ApubActor};
-use lemmy_db_views_actor::community_follower_view::CommunityFollowerView;
+use lemmy_db_views_actor::structs::CommunityFollowerView;
use lemmy_utils::{
+ error::LemmyError,
utils::{convert_datetime, markdown_to_html},
- LemmyError,
};
use lemmy_websocket::LemmyContext;
use std::ops::Deref;
impl From<Community> for ApubCommunity {
fn from(c: Community) -> Self {
- ApubCommunity { 0: c }
+ ApubCommunity(c)
}
}
impl ApubObject for ApubCommunity {
type DataType = LemmyContext;
type ApubType = Group;
- type TombstoneType = Tombstone;
+ type DbType = Community;
+ 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| {
- Community::read_from_apub_id(conn, object_id)
+ Community::read_from_apub_id(conn, &object_id.into())
})
.await??
.map(Into::into),
#[tracing::instrument(skip_all)]
async fn into_apub(self, _context: &LemmyContext) -> Result<Group, LemmyError> {
- let source = self.description.clone().map(|bio| Source {
- content: bio,
- media_type: MediaTypeMarkdown::Markdown,
- });
- let icon = self.icon.clone().map(ImageObject::new);
- let image = self.banner.clone().map(ImageObject::new);
-
let group = Group {
kind: GroupType::Group,
id: ObjectId::new(self.actor_id()),
preferred_username: self.name.clone(),
- name: self.title.clone(),
+ name: Some(self.title.clone()),
summary: self.description.as_ref().map(|b| markdown_to_html(b)),
- source,
- icon,
- image,
+ source: self.description.clone().map(Source::new),
+ icon: self.icon.clone().map(ImageObject::new),
+ image: self.banner.clone().map(ImageObject::new),
sensitive: Some(self.nsfw),
moderators: Some(ObjectId::<ApubCommunityModerators>::new(
generate_moderators_url(&self.actor_id)?,
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(),
published: Some(convert_datetime(self.published)),
updated: self.updated.map(convert_datetime),
- unparsed: Default::default(),
+ posting_restricted_to_mods: Some(self.posting_restricted_to_mods),
};
Ok(group)
}
- fn to_tombstone(&self) -> Result<Tombstone, LemmyError> {
- Ok(Tombstone::new(self.actor_id()))
- }
-
#[tracing::instrument(skip_all)]
async fn verify(
group: &Group,
group
.outbox
- .dereference(&outbox_data, context.client(), 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(&outbox_data, context.client(), request_counter)
+ .dereference(&outbox_data, local_instance(context), request_counter)
.await
.map_err(|e| debug!("{}", e))
.ok();
}
+ fetch_instance_actor_for_object(community.actor_id(), context, request_counter).await;
+
Ok(community)
}
}
-impl ActorType for ApubCommunity {
- fn actor_id(&self) -> Url {
- 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 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 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 ApubCommunity {
/// For a given community, returns the inboxes of all followers.
#[tracing::instrument(skip_all)]
.unique()
.filter(|inbox: &Url| inbox.host_str() != Some(&context.settings().hostname))
// Don't send to blocked instances
- .filter(|inbox| check_is_apub_id_valid(inbox, false, &context.settings()).is_ok())
+ .filter(|inbox| check_apub_id_valid_with_strictness(inbox, false, context.settings()).is_ok())
.collect();
Ok(inboxes)
#[cfg(test)]
pub(crate) mod tests {
use super::*;
- use crate::objects::tests::{file_to_json_object, init_context};
- use lemmy_apub_lib::activity_queue::create_activity_queue;
- use lemmy_db_schema::traits::Crud;
+ use crate::{
+ objects::{instance::tests::parse_lemmy_instance, tests::init_context},
+ protocol::tests::file_to_json_object,
+ };
+ use lemmy_db_schema::{source::site::Site, traits::Crud};
use serial_test::serial;
pub(crate) async fn parse_lemmy_community(context: &LemmyContext) -> ApubCommunity {
let community = ApubCommunity::from_apub(json, context, &mut request_counter)
.await
.unwrap();
- // this makes two requests to the (intentionally) broken outbox/moderators collections
+ // this makes one requests to the (intentionally broken) outbox collection
assert_eq!(request_counter, 1);
community
}
#[actix_rt::test]
#[serial]
async fn test_parse_lemmy_community() {
- 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 site = parse_lemmy_instance(&context).await;
let community = parse_lemmy_community(&context).await;
assert_eq!(community.title, "Ten Forward");
assert!(!community.local);
assert_eq!(community.description.as_ref().unwrap().len(), 132);
- Community::delete(&*context.pool().get().unwrap(), community.id).unwrap();
+ Community::delete(conn, community.id).unwrap();
+ Site::delete(conn, site.id).unwrap();
}
}
projects / lemmy.git / blobdiff