Merge branch 'master' into federation

diff --cc server/config/defaults.hjson
Simple merge

diff --cc server/src/websocket/server.rs
index 0c606284537c4c6f3fa4de9b8edfca6d39a53a6d,1cbcb34fb738ebd10e853d65a196fa10246b5e28..76a55540f887ea2b5fad8b444e48dcdaeb52d0d8
--- 1/server/src/websocket/server.rs
--- 2/server/src/websocket/server.rs
+++ b/server/src/websocket/server.rs
@@@ -518,17 -564,14 +582,20 @@@ fn parse_json_message(chat: &mut ChatSe
        to_json_string(&user_operation, &res)
      }
      UserOperation::ListCommunities => {
 -      do_user_operation::<ListCommunities, ListCommunitiesResponse>(user_operation, data, &conn)
 +      if Settings::get().federation_enabled {
 +        let res = get_all_communities()?;
 +        let val = ListCommunitiesResponse { communities: res };
 +        to_json_string(&user_operation, &val)
 +      } else {
 +        do_user_operation::<ListCommunities, ListCommunitiesResponse>(user_operation, data, &conn)
 +      }
      }
      UserOperation::CreateCommunity => {
-       chat.check_rate_limit_register(msg.id)?;
-       do_user_operation::<CreateCommunity, CommunityResponse>(user_operation, data, &conn)
+       chat.check_rate_limit_register(msg.id, true)?;
+       let create_community: CreateCommunity = serde_json::from_str(data)?;
+       let res = Oper::new(create_community).perform(&conn)?;
+       chat.check_rate_limit_register(msg.id, false)?;
+       to_json_string(&user_operation, &res)
      }
      UserOperation::EditCommunity => {
        let edit_community: EditCommunity = serde_json::from_str(data)?;