Redoing nightly fmt

.rustfmt.toml

@@ -1,5 +1,5 @@
 tab_spaces = 2
 edition="2018"
-# imports_layout="HorizontalVertical"
+imports_layout="HorizontalVertical"
-# merge_imports=true
+merge_imports=true
 reorder_imports=true

lemmy_api_structs/src/site.rs

@@ -1,6 +1,12 @@
 use lemmy_db::{
-  category::*, comment_view::*, community_view::*, moderator_views::*, post_view::*, site_view::*,
+  category::*,
-  user::*, user_view::*,
+  comment_view::*,
+  community_view::*,
+  moderator_views::*,
+  post_view::*,
+  site_view::*,
+  user::*,
+  user_view::*,
 };
 use serde::{Deserialize, Serialize};
 

lemmy_db/src/activity.rs

@@ -85,7 +85,9 @@ mod tests {
     activity::{Activity, ActivityForm},
     tests::establish_unpooled_connection,
     user::{UserForm, User_},
-    Crud, ListingType, SortType,
+    Crud,
+    ListingType,
+    SortType,
   };
   use serde_json::Value;
 

lemmy_db/src/comment.rs

@@ -2,7 +2,9 @@ use super::post::Post;
 use crate::{
   naive_now,
   schema::{comment, comment_like, comment_saved},
-  Crud, Likeable, Saveable,
+  Crud,
+  Likeable,
+  Saveable,
 };
 use diesel::{dsl::*, result::Error, *};
 use url::{ParseError, Url};
@@ -255,8 +257,14 @@ impl Saveable<CommentSavedForm> for CommentSaved {
 #[cfg(test)]
 mod tests {
   use crate::{
-    comment::*, community::*, post::*, tests::establish_unpooled_connection, user::*, Crud,
+    comment::*,
-    ListingType, SortType,
+    community::*,
+    post::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    Crud,
+    ListingType,
+    SortType,
   };
 
   #[test]

lemmy_db/src/comment_view.rs

@@ -495,8 +495,15 @@ impl<'a> ReplyQueryBuilder<'a> {
 #[cfg(test)]
 mod tests {
   use crate::{
-    comment::*, comment_view::*, community::*, post::*, tests::establish_unpooled_connection,
+    comment::*,
-    user::*, Crud, Likeable, *,
+    comment_view::*,
+    community::*,
+    post::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    Crud,
+    Likeable,
+    *,
   };
 
   #[test]

lemmy_db/src/community.rs

@@ -1,7 +1,10 @@
 use crate::{
   naive_now,
   schema::{community, community_follower, community_moderator, community_user_ban},
-  Bannable, Crud, Followable, Joinable,
+  Bannable,
+  Crud,
+  Followable,
+  Joinable,
 };
 use diesel::{dsl::*, result::Error, *};
 

lemmy_db/src/moderator.rs

@@ -1,7 +1,14 @@
 use crate::{
   schema::{
-    mod_add, mod_add_community, mod_ban, mod_ban_from_community, mod_lock_post, mod_remove_comment,
+    mod_add,
-    mod_remove_community, mod_remove_post, mod_sticky_post,
+    mod_add_community,
+    mod_ban,
+    mod_ban_from_community,
+    mod_lock_post,
+    mod_remove_comment,
+    mod_remove_community,
+    mod_remove_post,
+    mod_sticky_post,
   },
   Crud,
 };
@@ -385,8 +392,14 @@ impl Crud<ModAddForm> for ModAdd {
 #[cfg(test)]
 mod tests {
   use crate::{
-    comment::*, community::*, moderator::*, post::*, tests::establish_unpooled_connection, user::*,
+    comment::*,
-    ListingType, SortType,
+    community::*,
+    moderator::*,
+    post::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    ListingType,
+    SortType,
   };
 
   // use Crud;

lemmy_db/src/password_reset_request.rs

@@ -80,8 +80,11 @@ impl PasswordResetRequest {
 mod tests {
   use super::super::user::*;
   use crate::{
-    password_reset_request::PasswordResetRequest, tests::establish_unpooled_connection, Crud,
+    password_reset_request::PasswordResetRequest,
-    ListingType, SortType,
+    tests::establish_unpooled_connection,
+    Crud,
+    ListingType,
+    SortType,
   };
 
   #[test]

lemmy_db/src/post.rs

@@ -1,7 +1,10 @@
 use crate::{
   naive_now,
   schema::{post, post_like, post_read, post_saved},
-  Crud, Likeable, Readable, Saveable,
+  Crud,
+  Likeable,
+  Readable,
+  Saveable,
 };
 use diesel::{dsl::*, result::Error, *};
 use url::{ParseError, Url};
@@ -325,7 +328,12 @@ impl Readable<PostReadForm> for PostRead {
 #[cfg(test)]
 mod tests {
   use crate::{
-    community::*, post::*, tests::establish_unpooled_connection, user::*, ListingType, SortType,
+    community::*,
+    post::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    ListingType,
+    SortType,
   };
 
   #[test]

lemmy_db/src/post_view.rs

@@ -387,8 +387,14 @@ impl PostView {
 #[cfg(test)]
 mod tests {
   use crate::{
-    community::*, post::*, post_view::*, tests::establish_unpooled_connection, user::*, Crud,
+    community::*,
-    Likeable, *,
+    post::*,
+    post_view::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    Crud,
+    Likeable,
+    *,
   };
 
   #[test]

lemmy_db/src/private_message.rs

@@ -137,7 +137,11 @@ impl PrivateMessage {
 #[cfg(test)]
 mod tests {
   use crate::{
-    private_message::*, tests::establish_unpooled_connection, user::*, ListingType, SortType,
+    private_message::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    ListingType,
+    SortType,
   };
 
   #[test]

lemmy_db/src/user.rs

@@ -1,5 +1,6 @@
 use crate::{
-  is_email_regex, naive_now,
+  is_email_regex,
+  naive_now,
   schema::{user_, user_::dsl::*},
   Crud,
 };

lemmy_db/src/user_mention.rs

@@ -73,8 +73,14 @@ impl UserMention {
 #[cfg(test)]
 mod tests {
   use crate::{
-    comment::*, community::*, post::*, tests::establish_unpooled_connection, user::*,
+    comment::*,
-    user_mention::*, ListingType, SortType,
+    community::*,
+    post::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    user_mention::*,
+    ListingType,
+    SortType,
   };
 
   #[test]

lemmy_utils/src/lib.rs

@@ -24,7 +24,9 @@ use lettre::{
     extension::ClientId,
     ConnectionReuseParameters,
   },
-  ClientSecurity, SmtpClient, Transport,
+  ClientSecurity,
+  SmtpClient,
+  Transport,
 };
 use lettre_email::Email;
 use openssl::{pkey::PKey, rsa::Rsa};
@@ -221,8 +223,14 @@ pub fn is_valid_post_title(title: &str) -> bool {
 #[cfg(test)]
 mod tests {
   use crate::{
-    is_valid_community_name, is_valid_post_title, is_valid_preferred_username, is_valid_username,
+    is_valid_community_name,
-    remove_slurs, scrape_text_for_mentions, slur_check, slurs_vec_to_str,
+    is_valid_post_title,
+    is_valid_preferred_username,
+    is_valid_username,
+    remove_slurs,
+    scrape_text_for_mentions,
+    slur_check,
+    slurs_vec_to_str,
   };
 
   #[test]

src/api/comment.rs

@@ -1,6 +1,10 @@
 use crate::{
   api::{
-    check_community_ban, get_post, get_user_from_jwt, get_user_from_jwt_opt, is_mod_or_admin,
+    check_community_ban,
+    get_post,
+    get_user_from_jwt,
+    get_user_from_jwt_opt,
+    is_mod_or_admin,
     Perform,
   },
   apub::{ApubLikeableType, ApubObjectType},
@@ -9,17 +13,36 @@ use crate::{
     messages::{JoinCommunityRoom, SendComment},
     UserOperation,
   },
-  DbPool, LemmyContext,
+  DbPool,
+  LemmyContext,
 };
 use actix_web::web::Data;
 use lemmy_api_structs::comment::*;
 use lemmy_db::{
-  comment::*, comment_view::*, moderator::*, post::*, site_view::*, user::*, user_mention::*, Crud,
+  comment::*,
-  Likeable, ListingType, Saveable, SortType,
+  comment_view::*,
+  moderator::*,
+  post::*,
+  site_view::*,
+  user::*,
+  user_mention::*,
+  Crud,
+  Likeable,
+  ListingType,
+  Saveable,
+  SortType,
 };
 use lemmy_utils::{
-  make_apub_endpoint, remove_slurs, scrape_text_for_mentions, send_email, settings::Settings,
+  make_apub_endpoint,
-  APIError, ConnectionId, EndpointType, LemmyError, MentionData,
+  remove_slurs,
+  scrape_text_for_mentions,
+  send_email,
+  settings::Settings,
+  APIError,
+  ConnectionId,
+  EndpointType,
+  LemmyError,
+  MentionData,
 };
 use log::error;
 use std::str::FromStr;

src/api/community.rs

@@ -1,7 +1,12 @@
 use crate::{
   api::{
-    check_slurs, check_slurs_opt, get_user_from_jwt, get_user_from_jwt_opt, is_admin,
+    check_slurs,
-    is_mod_or_admin, Perform,
+    check_slurs_opt,
+    get_user_from_jwt,
+    get_user_from_jwt_opt,
+    is_admin,
+    is_mod_or_admin,
+    Perform,
   },
   apub::ActorType,
   blocking,
@@ -15,13 +20,32 @@ use actix_web::web::Data;
 use anyhow::Context;
 use lemmy_api_structs::community::*;
 use lemmy_db::{
-  comment::Comment, comment_view::CommentQueryBuilder, community::*, community_view::*,
+  comment::Comment,
-  diesel_option_overwrite, moderator::*, naive_now, post::Post, site::*, user_view::*, Bannable,
+  comment_view::CommentQueryBuilder,
-  Crud, Followable, Joinable, SortType,
+  community::*,
+  community_view::*,
+  diesel_option_overwrite,
+  moderator::*,
+  naive_now,
+  post::Post,
+  site::*,
+  user_view::*,
+  Bannable,
+  Crud,
+  Followable,
+  Joinable,
+  SortType,
 };
 use lemmy_utils::{
-  generate_actor_keypair, is_valid_community_name, location_info, make_apub_endpoint,
+  generate_actor_keypair,
-  naive_from_unix, APIError, ConnectionId, EndpointType, LemmyError,
+  is_valid_community_name,
+  location_info,
+  make_apub_endpoint,
+  naive_from_unix,
+  APIError,
+  ConnectionId,
+  EndpointType,
+  LemmyError,
 };
 use std::str::FromStr;
 

src/api/mod.rs

@@ -1,7 +1,11 @@
 use crate::{api::claims::Claims, blocking, DbPool, LemmyContext};
 use actix_web::web::Data;
 use lemmy_db::{
-  community::Community, community_view::CommunityUserBanView, post::Post, user::User_, Crud,
+  community::Community,
+  community_view::CommunityUserBanView,
+  post::Post,
+  user::User_,
+  Crud,
 };
 use lemmy_utils::{slur_check, slurs_vec_to_str, APIError, ConnectionId, LemmyError};
 

src/api/post.rs

@@ -1,10 +1,16 @@
 use crate::{
   api::{
-    check_community_ban, check_slurs, check_slurs_opt, get_user_from_jwt, get_user_from_jwt_opt,
+    check_community_ban,
-    is_mod_or_admin, Perform,
+    check_slurs,
+    check_slurs_opt,
+    get_user_from_jwt,
+    get_user_from_jwt_opt,
+    is_mod_or_admin,
+    Perform,
   },
   apub::{ApubLikeableType, ApubObjectType},
-  blocking, fetch_iframely_and_pictrs_data,
+  blocking,
+  fetch_iframely_and_pictrs_data,
   websocket::{
     messages::{GetPostUsersOnline, JoinCommunityRoom, JoinPostRoom, SendPost},
     UserOperation,
@@ -14,11 +20,26 @@ use crate::{
 use actix_web::web::Data;
 use lemmy_api_structs::post::*;
 use lemmy_db::{
-  comment_view::*, community_view::*, moderator::*, naive_now, post::*, post_view::*, site_view::*,
+  comment_view::*,
-  Crud, Likeable, ListingType, Saveable, SortType,
+  community_view::*,
+  moderator::*,
+  naive_now,
+  post::*,
+  post_view::*,
+  site_view::*,
+  Crud,
+  Likeable,
+  ListingType,
+  Saveable,
+  SortType,
 };
 use lemmy_utils::{
-  is_valid_post_title, make_apub_endpoint, APIError, ConnectionId, EndpointType, LemmyError,
+  is_valid_post_title,
+  make_apub_endpoint,
+  APIError,
+  ConnectionId,
+  EndpointType,
+  LemmyError,
 };
 use std::str::FromStr;
 use url::Url;

src/api/site.rs

@@ -1,9 +1,15 @@
 use crate::{
   api::{
-    check_slurs, check_slurs_opt, get_user_from_jwt, get_user_from_jwt_opt, is_admin, Perform,
+    check_slurs,
+    check_slurs_opt,
+    get_user_from_jwt,
+    get_user_from_jwt_opt,
+    is_admin,
+    Perform,
   },
   apub::fetcher::search_by_apub_id,
-  blocking, version,
+  blocking,
+  version,
   websocket::{
     messages::{GetUsersOnline, SendAllMessage},
     UserOperation,
@@ -14,9 +20,20 @@ use actix_web::web::Data;
 use anyhow::Context;
 use lemmy_api_structs::{site::*, user::Register};
 use lemmy_db::{
-  category::*, comment_view::*, community_view::*, diesel_option_overwrite, moderator::*,
+  category::*,
-  moderator_views::*, naive_now, post_view::*, site::*, site_view::*, user_view::*, Crud,
+  comment_view::*,
-  SearchType, SortType,
+  community_view::*,
+  diesel_option_overwrite,
+  moderator::*,
+  moderator_views::*,
+  naive_now,
+  post_view::*,
+  site::*,
+  site_view::*,
+  user_view::*,
+  Crud,
+  SearchType,
+  SortType,
 };
 use lemmy_utils::{location_info, settings::Settings, APIError, ConnectionId, LemmyError};
 use log::{debug, info};

src/api/user.rs

@@ -1,7 +1,8 @@
 use crate::{
   api::{check_slurs, claims::Claims, get_user_from_jwt, get_user_from_jwt_opt, is_admin, Perform},
   apub::ApubObjectType,
-  blocking, captcha_espeak_wav_base64,
+  blocking,
+  captcha_espeak_wav_base64,
   websocket::{
     messages::{CaptchaItem, CheckCaptcha, JoinUserRoom, SendAllMessage, SendUserRoomMessage},
     UserOperation,
@@ -15,15 +16,45 @@ use captcha::{gen, Difficulty};
 use chrono::Duration;
 use lemmy_api_structs::user::*;
 use lemmy_db::{
-  comment::*, comment_view::*, community::*, community_view::*, diesel_option_overwrite,
+  comment::*,
-  moderator::*, naive_now, password_reset_request::*, post::*, post_view::*, private_message::*,
+  comment_view::*,
-  private_message_view::*, site::*, site_view::*, user::*, user_mention::*, user_mention_view::*,
+  community::*,
-  user_view::*, Crud, Followable, Joinable, ListingType, SortType,
+  community_view::*,
+  diesel_option_overwrite,
+  moderator::*,
+  naive_now,
+  password_reset_request::*,
+  post::*,
+  post_view::*,
+  private_message::*,
+  private_message_view::*,
+  site::*,
+  site_view::*,
+  user::*,
+  user_mention::*,
+  user_mention_view::*,
+  user_view::*,
+  Crud,
+  Followable,
+  Joinable,
+  ListingType,
+  SortType,
 };
 use lemmy_utils::{
-  generate_actor_keypair, generate_random_string, is_valid_preferred_username, is_valid_username,
+  generate_actor_keypair,
-  location_info, make_apub_endpoint, naive_from_unix, remove_slurs, send_email, settings::Settings,
+  generate_random_string,
-  APIError, ConnectionId, EndpointType, LemmyError,
+  is_valid_preferred_username,
+  is_valid_username,
+  location_info,
+  make_apub_endpoint,
+  naive_from_unix,
+  remove_slurs,
+  send_email,
+  settings::Settings,
+  APIError,
+  ConnectionId,
+  EndpointType,
+  LemmyError,
 };
 use log::error;
 use std::str::FromStr;

src/apub/activity_queue.rs

@@ -6,7 +6,13 @@ use activitystreams::{
 use anyhow::{anyhow, Context, Error};
 use awc::Client;
 use background_jobs::{
-  create_server, memory_storage::Storage, ActixJob, Backoff, MaxRetries, QueueHandle, WorkerConfig,
+  create_server,
+  memory_storage::Storage,
+  ActixJob,
+  Backoff,
+  MaxRetries,
+  QueueHandle,
+  WorkerConfig,
 };
 use lemmy_utils::{location_info, settings::Settings, LemmyError};
 use log::warn;

src/apub/comment.rs

@@ -1,19 +1,36 @@
 use crate::{
   apub::{
     activities::{generate_activity_id, send_activity_to_community},
-    check_actor_domain, create_apub_response, create_apub_tombstone_response, create_tombstone,
+    check_actor_domain,
+    create_apub_response,
+    create_apub_tombstone_response,
+    create_tombstone,
     fetch_webfinger_url,
     fetcher::{
-      get_or_fetch_and_insert_comment, get_or_fetch_and_insert_post, get_or_fetch_and_upsert_user,
+      get_or_fetch_and_insert_comment,
+      get_or_fetch_and_insert_post,
+      get_or_fetch_and_upsert_user,
     },
-    ActorType, ApubLikeableType, ApubObjectType, FromApub, ToApub,
+    ActorType,
+    ApubLikeableType,
+    ApubObjectType,
+    FromApub,
+    ToApub,
   },
-  blocking, DbPool, LemmyContext,
+  blocking,
+  DbPool,
+  LemmyContext,
 };
 use activitystreams::{
   activity::{
     kind::{CreateType, DeleteType, DislikeType, LikeType, RemoveType, UndoType, UpdateType},
-    Create, Delete, Dislike, Like, Remove, Undo, Update,
+    Create,
+    Delete,
+    Dislike,
+    Like,
+    Remove,
+    Undo,
+    Update,
   },
   base::AnyBase,
   link::Mention,
@@ -32,7 +49,12 @@ use lemmy_db::{
   Crud,
 };
 use lemmy_utils::{
-  convert_datetime, location_info, remove_slurs, scrape_text_for_mentions, LemmyError, MentionData,
+  convert_datetime,
+  location_info,
+  remove_slurs,
+  scrape_text_for_mentions,
+  LemmyError,
+  MentionData,
 };
 use log::debug;
 use serde::Deserialize;

src/apub/community.rs

@@ -3,17 +3,31 @@ use crate::{
   apub::{
     activities::generate_activity_id,
     activity_queue::send_activity,
-    check_actor_domain, create_apub_response, create_apub_tombstone_response, create_tombstone,
+    check_actor_domain,
+    create_apub_response,
+    create_apub_tombstone_response,
+    create_tombstone,
     extensions::group_extensions::GroupExtension,
     fetcher::{get_or_fetch_and_upsert_actor, get_or_fetch_and_upsert_user},
-    insert_activity, ActorType, FromApub, GroupExt, ToApub,
+    insert_activity,
+    ActorType,
+    FromApub,
+    GroupExt,
+    ToApub,
   },
-  blocking, DbPool, LemmyContext,
+  blocking,
+  DbPool,
+  LemmyContext,
 };
 use activitystreams::{
   activity::{
     kind::{AcceptType, AnnounceType, DeleteType, LikeType, RemoveType, UndoType},
-    Accept, Announce, Delete, Follow, Remove, Undo,
+    Accept,
+    Announce,
+    Delete,
+    Follow,
+    Remove,
+    Undo,
   },
   actor::{kind::GroupType, ApActor, Endpoints, Group},
   base::{AnyBase, BaseExt},

src/apub/fetcher.rs

@@ -1,6 +1,11 @@
 use crate::{
   apub::{
-    check_is_apub_id_valid, ActorType, FromApub, GroupExt, PageExt, PersonExt,
+    check_is_apub_id_valid,
+    ActorType,
+    FromApub,
+    GroupExt,
+    PageExt,
+    PersonExt,
     APUB_JSON_CONTENT_TYPE,
   },
   blocking,
@@ -22,7 +27,9 @@ use lemmy_db::{
   post_view::PostView,
   user::{UserForm, User_},
   user_view::UserView,
-  Crud, Joinable, SearchType,
+  Crud,
+  Joinable,
+  SearchType,
 };
 use lemmy_utils::{get_apub_protocol_string, location_info, LemmyError};
 use log::debug;

src/apub/inbox/activities/announce.rs

@@ -1,8 +1,13 @@
 use crate::{
   apub::inbox::{
     activities::{
-      create::receive_create, delete::receive_delete, dislike::receive_dislike, like::receive_like,
+      create::receive_create,
-      remove::receive_remove, undo::receive_undo, update::receive_update,
+      delete::receive_delete,
+      dislike::receive_dislike,
+      like::receive_like,
+      remove::receive_remove,
+      undo::receive_undo,
+      update::receive_update,
     },
     shared_inbox::{get_community_id_from_activity, receive_unhandled_activity},
   },

src/apub/inbox/activities/create.rs

@@ -2,9 +2,13 @@ use crate::{
   api::comment::send_local_notifs,
   apub::{
     inbox::shared_inbox::{
-      announce_if_community_is_local, get_user_from_activity, receive_unhandled_activity,
+      announce_if_community_is_local,
+      get_user_from_activity,
+      receive_unhandled_activity,
     },
-    ActorType, FromApub, PageExt,
+    ActorType,
+    FromApub,
+    PageExt,
   },
   blocking,
   websocket::{

src/apub/inbox/activities/delete.rs

@@ -2,9 +2,14 @@ use crate::{
   apub::{
     fetcher::{get_or_fetch_and_insert_comment, get_or_fetch_and_insert_post},
     inbox::shared_inbox::{
-      announce_if_community_is_local, get_user_from_activity, receive_unhandled_activity,
+      announce_if_community_is_local,
+      get_user_from_activity,
+      receive_unhandled_activity,
     },
-    ActorType, FromApub, GroupExt, PageExt,
+    ActorType,
+    FromApub,
+    GroupExt,
+    PageExt,
   },
   blocking,
   websocket::{
@@ -17,7 +22,9 @@ use activitystreams::{activity::Delete, base::AnyBase, object::Note, prelude::*}
 use actix_web::HttpResponse;
 use anyhow::Context;
 use lemmy_api_structs::{
-  comment::CommentResponse, community::CommunityResponse, post::PostResponse,
+  comment::CommentResponse,
+  community::CommunityResponse,
+  post::PostResponse,
 };
 use lemmy_db::{
   comment::{Comment, CommentForm},

src/apub/inbox/activities/dislike.rs

@@ -2,9 +2,12 @@ use crate::{
   apub::{
     fetcher::{get_or_fetch_and_insert_comment, get_or_fetch_and_insert_post},
     inbox::shared_inbox::{
-      announce_if_community_is_local, get_user_from_activity, receive_unhandled_activity,
+      announce_if_community_is_local,
+      get_user_from_activity,
+      receive_unhandled_activity,
     },
-    FromApub, PageExt,
+    FromApub,
+    PageExt,
   },
   blocking,
   websocket::{

src/apub/inbox/activities/like.rs

@@ -2,9 +2,12 @@ use crate::{
   apub::{
     fetcher::{get_or_fetch_and_insert_comment, get_or_fetch_and_insert_post},
     inbox::shared_inbox::{
-      announce_if_community_is_local, get_user_from_activity, receive_unhandled_activity,
+      announce_if_community_is_local,
+      get_user_from_activity,
+      receive_unhandled_activity,
     },
-    FromApub, PageExt,
+    FromApub,
+    PageExt,
   },
   blocking,
   websocket::{

src/apub/inbox/activities/remove.rs

@@ -2,10 +2,15 @@ use crate::{
   apub::{
     fetcher::{get_or_fetch_and_insert_comment, get_or_fetch_and_insert_post},
     inbox::shared_inbox::{
-      announce_if_community_is_local, get_community_id_from_activity, get_user_from_activity,
+      announce_if_community_is_local,
+      get_community_id_from_activity,
+      get_user_from_activity,
       receive_unhandled_activity,
     },
-    ActorType, FromApub, GroupExt, PageExt,
+    ActorType,
+    FromApub,
+    GroupExt,
+    PageExt,
   },
   blocking,
   websocket::{
@@ -18,7 +23,9 @@ use activitystreams::{activity::Remove, base::AnyBase, object::Note, prelude::*}
 use actix_web::HttpResponse;
 use anyhow::{anyhow, Context};
 use lemmy_api_structs::{
-  comment::CommentResponse, community::CommunityResponse, post::PostResponse,
+  comment::CommentResponse,
+  community::CommunityResponse,
+  post::PostResponse,
 };
 use lemmy_db::{
   comment::{Comment, CommentForm},

src/apub/inbox/activities/undo.rs

@@ -2,9 +2,14 @@ use crate::{
   apub::{
     fetcher::{get_or_fetch_and_insert_comment, get_or_fetch_and_insert_post},
     inbox::shared_inbox::{
-      announce_if_community_is_local, get_user_from_activity, receive_unhandled_activity,
+      announce_if_community_is_local,
+      get_user_from_activity,
+      receive_unhandled_activity,
     },
-    ActorType, FromApub, GroupExt, PageExt,
+    ActorType,
+    FromApub,
+    GroupExt,
+    PageExt,
   },
   blocking,
   websocket::{
@@ -22,7 +27,9 @@ use activitystreams::{
 use actix_web::HttpResponse;
 use anyhow::{anyhow, Context};
 use lemmy_api_structs::{
-  comment::CommentResponse, community::CommunityResponse, post::PostResponse,
+  comment::CommentResponse,
+  community::CommunityResponse,
+  post::PostResponse,
 };
 use lemmy_db::{
   comment::{Comment, CommentForm, CommentLike},
@@ -32,7 +39,8 @@ use lemmy_db::{
   naive_now,
   post::{Post, PostForm, PostLike},
   post_view::PostView,
-  Crud, Likeable,
+  Crud,
+  Likeable,
 };
 use lemmy_utils::{location_info, LemmyError};
 

src/apub/inbox/activities/update.rs

@@ -3,9 +3,13 @@ use crate::{
   apub::{
     fetcher::{get_or_fetch_and_insert_comment, get_or_fetch_and_insert_post},
     inbox::shared_inbox::{
-      announce_if_community_is_local, get_user_from_activity, receive_unhandled_activity,
+      announce_if_community_is_local,
+      get_user_from_activity,
+      receive_unhandled_activity,
     },
-    ActorType, FromApub, PageExt,
+    ActorType,
+    FromApub,
+    PageExt,
   },
   blocking,
   websocket::{

src/apub/inbox/community_inbox.rs

@@ -1,9 +1,13 @@
 use crate::{
   apub::{
-    check_is_apub_id_valid, extensions::signatures::verify, fetcher::get_or_fetch_and_upsert_user,
+    check_is_apub_id_valid,
-    insert_activity, ActorType,
+    extensions::signatures::verify,
+    fetcher::get_or_fetch_and_upsert_user,
+    insert_activity,
+    ActorType,
   },
-  blocking, LemmyContext,
+  blocking,
+  LemmyContext,
 };
 use activitystreams::{
   activity::{ActorAndObject, Follow, Undo},

src/apub/inbox/shared_inbox.rs

@@ -4,12 +4,18 @@ use crate::{
     community::do_announce,
     extensions::signatures::verify,
     fetcher::{
-      get_or_fetch_and_upsert_actor, get_or_fetch_and_upsert_community,
+      get_or_fetch_and_upsert_actor,
+      get_or_fetch_and_upsert_community,
       get_or_fetch_and_upsert_user,
     },
     inbox::activities::{
-      announce::receive_announce, create::receive_create, delete::receive_delete,
+      announce::receive_announce,
-      dislike::receive_dislike, like::receive_like, remove::receive_remove, undo::receive_undo,
+      create::receive_create,
+      delete::receive_delete,
+      dislike::receive_dislike,
+      like::receive_like,
+      remove::receive_remove,
+      undo::receive_undo,
       update::receive_update,
     },
     insert_activity,

src/apub/inbox/user_inbox.rs

@@ -3,7 +3,8 @@ use crate::{
     check_is_apub_id_valid,
     extensions::signatures::verify,
     fetcher::{get_or_fetch_and_upsert_actor, get_or_fetch_and_upsert_community},
-    insert_activity, FromApub,
+    insert_activity,
+    FromApub,
   },
   blocking,
   websocket::{messages::SendUserRoomMessage, UserOperation},
@@ -24,7 +25,8 @@ use lemmy_db::{
   private_message::{PrivateMessage, PrivateMessageForm},
   private_message_view::PrivateMessageView,
   user::User_,
-  Crud, Followable,
+  Crud,
+  Followable,
 };
 use lemmy_utils::{location_info, LemmyError};
 use log::debug;

src/apub/mod.rs

@@ -18,7 +18,8 @@ use crate::{
   blocking,
   request::{retry, RecvError},
   routes::webfinger::WebFingerResponse,
-  DbPool, LemmyContext,
+  DbPool,
+  LemmyContext,
 };
 use activitystreams::{
   activity::Follow,
@@ -34,7 +35,11 @@ use anyhow::{anyhow, Context};
 use chrono::NaiveDateTime;
 use lemmy_db::{activity::do_insert_activity, user::User_};
 use lemmy_utils::{
-  convert_datetime, get_apub_protocol_string, location_info, settings::Settings, LemmyError,
+  convert_datetime,
+  get_apub_protocol_string,
+  location_info,
+  settings::Settings,
+  LemmyError,
   MentionData,
 };
 use log::debug;

src/apub/post.rs

@@ -2,17 +2,33 @@ use crate::{
   api::check_slurs,
   apub::{
     activities::{generate_activity_id, send_activity_to_community},
-    check_actor_domain, create_apub_response, create_apub_tombstone_response, create_tombstone,
+    check_actor_domain,
+    create_apub_response,
+    create_apub_tombstone_response,
+    create_tombstone,
     extensions::page_extension::PageExtension,
     fetcher::{get_or_fetch_and_upsert_community, get_or_fetch_and_upsert_user},
-    ActorType, ApubLikeableType, ApubObjectType, FromApub, PageExt, ToApub,
+    ActorType,
+    ApubLikeableType,
+    ApubObjectType,
+    FromApub,
+    PageExt,
+    ToApub,
   },
-  blocking, DbPool, LemmyContext,
+  blocking,
+  DbPool,
+  LemmyContext,
 };
 use activitystreams::{
   activity::{
     kind::{CreateType, DeleteType, DislikeType, LikeType, RemoveType, UndoType, UpdateType},
-    Create, Delete, Dislike, Like, Remove, Undo, Update,
+    Create,
+    Delete,
+    Dislike,
+    Like,
+    Remove,
+    Undo,
+    Update,
   },
   object::{kind::PageType, Image, Object, Page, Tombstone},
   prelude::*,

src/apub/private_message.rs

@@ -1,15 +1,28 @@
 use crate::{
   apub::{
-    activities::generate_activity_id, activity_queue::send_activity, check_actor_domain,
+    activities::generate_activity_id,
-    check_is_apub_id_valid, create_tombstone, fetcher::get_or_fetch_and_upsert_user,
+    activity_queue::send_activity,
-    insert_activity, ActorType, ApubObjectType, FromApub, ToApub,
+    check_actor_domain,
+    check_is_apub_id_valid,
+    create_tombstone,
+    fetcher::get_or_fetch_and_upsert_user,
+    insert_activity,
+    ActorType,
+    ApubObjectType,
+    FromApub,
+    ToApub,
   },
-  blocking, DbPool, LemmyContext,
+  blocking,
+  DbPool,
+  LemmyContext,
 };
 use activitystreams::{
   activity::{
     kind::{CreateType, DeleteType, UndoType, UpdateType},
-    Create, Delete, Undo, Update,
+    Create,
+    Delete,
+    Undo,
+    Update,
   },
   object::{kind::NoteType, Note, Tombstone},
   prelude::*,

src/apub/user.rs

@@ -1,16 +1,26 @@
 use crate::{
   api::{check_slurs, check_slurs_opt},
   apub::{
-    activities::generate_activity_id, activity_queue::send_activity, check_actor_domain,
+    activities::generate_activity_id,
-    create_apub_response, fetcher::get_or_fetch_and_upsert_actor, insert_activity, ActorType,
+    activity_queue::send_activity,
-    FromApub, PersonExt, ToApub,
+    check_actor_domain,
+    create_apub_response,
+    fetcher::get_or_fetch_and_upsert_actor,
+    insert_activity,
+    ActorType,
+    FromApub,
+    PersonExt,
+    ToApub,
   },
-  blocking, DbPool, LemmyContext,
+  blocking,
+  DbPool,
+  LemmyContext,
 };
 use activitystreams::{
   activity::{
     kind::{FollowType, UndoType},
-    Follow, Undo,
+    Follow,
+    Undo,
   },
   actor::{ApActor, Endpoints, Person},
   object::{Image, Tombstone},

src/code_migrations.rs

@@ -13,8 +13,12 @@ use lemmy_db::{
   Crud,
 };
 use lemmy_utils::{
-  generate_actor_keypair, get_apub_protocol_string, make_apub_endpoint, settings::Settings,
+  generate_actor_keypair,
-  EndpointType, LemmyError,
+  get_apub_protocol_string,
+  make_apub_endpoint,
+  settings::Settings,
+  EndpointType,
+  LemmyError,
 };
 use log::info;
 

src/main.rs

@@ -19,8 +19,12 @@ use lazy_static::lazy_static;
 use lemmy_db::get_database_url_from_env;
 use lemmy_rate_limit::{rate_limiter::RateLimiter, RateLimit};
 use lemmy_server::{
-  apub::activity_queue::create_activity_queue, blocking, code_migrations::run_advanced_migrations,
+  apub::activity_queue::create_activity_queue,
-  routes::*, websocket::chat_server::ChatServer, LemmyContext,
+  blocking,
+  code_migrations::run_advanced_migrations,
+  routes::*,
+  websocket::chat_server::ChatServer,
+  LemmyContext,
 };
 use lemmy_utils::{settings::Settings, LemmyError, CACHE_CONTROL_REGEX};
 use reqwest::Client;

src/routes/feeds.rs

@@ -10,7 +10,8 @@ use lemmy_db::{
   site_view::SiteView,
   user::User_,
   user_mention_view::{UserMentionQueryBuilder, UserMentionView},
-  ListingType, SortType,
+  ListingType,
+  SortType,
 };
 use lemmy_utils::{markdown_to_html, settings::Settings, LemmyError};
 use rss::{CategoryBuilder, ChannelBuilder, GuidBuilder, Item, ItemBuilder};

src/routes/webfinger.rs

@@ -3,7 +3,10 @@ use actix_web::{error::ErrorBadRequest, web::Query, *};
 use anyhow::anyhow;
 use lemmy_db::{community::Community, user::User_};
 use lemmy_utils::{
-  settings::Settings, LemmyError, WEBFINGER_COMMUNITY_REGEX, WEBFINGER_USER_REGEX,
+  settings::Settings,
+  LemmyError,
+  WEBFINGER_COMMUNITY_REGEX,
+  WEBFINGER_USER_REGEX,
 };
 use serde::{Deserialize, Serialize};
 

src/websocket/chat_server.rs

@@ -16,7 +16,14 @@ use diesel::{
 use lemmy_api_structs::{comment::*, community::*, post::*, site::*, user::*};
 use lemmy_rate_limit::RateLimit;
 use lemmy_utils::{
-  location_info, APIError, CommunityId, ConnectionId, IPAddr, LemmyError, PostId, UserId,
+  location_info,
+  APIError,
+  CommunityId,
+  ConnectionId,
+  IPAddr,
+  LemmyError,
+  PostId,
+  UserId,
 };
 use rand::rngs::ThreadRng;
 use reqwest::Client;