Merge branch 'federation' into federated_remove_actions

diff --cc server/src/apub/comment.rs
Simple merge

diff --cc server/src/apub/community.rs
Simple merge

diff --cc server/src/apub/mod.rs
index 3c18a013339a86269d8c75db38c129614c2408ac,5b65411a34521fa93921a783234ce29122fea132..0438f92e00555224ea48c159828426f4206e58a6
--- 1/server/src/apub/mod.rs
--- 2/server/src/apub/mod.rs
+++ b/server/src/apub/mod.rs
@@@ -13,8 -13,8 +13,8 @@@ use crate::api::community::CommunityRes
  use crate::websocket::server::SendCommunityRoomMessage;
  use activitystreams::object::kind::{NoteType, PageType};
  use activitystreams::{
 -  activity::{Accept, Create, Delete, Dislike, Follow, Like, Undo, Update},
 +  activity::{Accept, Create, Delete, Dislike, Follow, Like, Remove, Undo, Update},
-   actor::{properties::ApActorProperties, Actor, Group, Person},
+   actor::{kind::GroupType, properties::ApActorProperties, Actor, Group, Person},
    collection::UnorderedCollection,
    context,
    endpoint::EndpointProperties,

diff --cc server/src/apub/post.rs
Simple merge