From: Felix Ableitner Date: Tue, 26 Oct 2021 19:05:26 +0000 (+0200) Subject: Merge traits ToApub and FromApub into ApubObject X-Git-Url: http://these/git/%22https:/nerdica.net/photo/contact/80/%24%7BappleTouchIcon%7D?a=commitdiff_plain;h=bb085189e0c2b7bcf523545f0695d336cace07e4;p=lemmy.git Merge traits ToApub and FromApub into ApubObject --- diff --git a/crates/apub/src/http/community.rs b/crates/apub/src/http/community.rs index dcaf551f..6a1c02d7 100644 --- a/crates/apub/src/http/community.rs +++ b/crates/apub/src/http/community.rs @@ -6,18 +6,14 @@ use crate::{ report::Report, }, collections::{ - community_moderators::ApubCommunityModerators, - community_outbox::ApubCommunityOutbox, + community_moderators::ApubCommunityModerators, community_outbox::ApubCommunityOutbox, CommunityContext, }, context::lemmy_context, fetcher::object_id::ObjectId, generate_outbox_url, http::{ - create_apub_response, - create_apub_tombstone_response, - payload_to_string, - receive_activity, + create_apub_response, create_apub_tombstone_response, payload_to_string, receive_activity, }, objects::community::ApubCommunity, }; diff --git a/crates/apub/src/objects/community.rs b/crates/apub/src/objects/community.rs index e71addba..21ae614f 100644 --- a/crates/apub/src/objects/community.rs +++ b/crates/apub/src/objects/community.rs @@ -1,14 +1,12 @@ use crate::{ check_is_apub_id_valid, collections::{ - community_moderators::ApubCommunityModerators, - community_outbox::ApubCommunityOutbox, + community_moderators::ApubCommunityModerators, community_outbox::ApubCommunityOutbox, CommunityContext, }, context::lemmy_context, fetcher::object_id::ObjectId, - generate_moderators_url, - generate_outbox_url, + generate_moderators_url, generate_outbox_url, objects::{get_summary_from_string_or_source, tombstone::Tombstone, ImageObject, Source}, CommunityType, };