From 6774bfd48deb9fdc030c19bf5a0d983587eff956 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 12 Sep 2020 12:40:39 -0500 Subject: [PATCH] Redoing nightly fmt --- .rustfmt.toml | 4 +-- lemmy_api_structs/src/site.rs | 10 ++++-- lemmy_db/src/activity.rs | 4 ++- lemmy_db/src/comment.rs | 14 ++++++-- lemmy_db/src/comment_view.rs | 11 ++++-- lemmy_db/src/community.rs | 5 ++- lemmy_db/src/moderator.rs | 21 +++++++++--- lemmy_db/src/password_reset_request.rs | 7 ++-- lemmy_db/src/post.rs | 12 +++++-- lemmy_db/src/post_view.rs | 10 ++++-- lemmy_db/src/private_message.rs | 6 +++- lemmy_db/src/user.rs | 3 +- lemmy_db/src/user_mention.rs | 10 ++++-- lemmy_utils/src/lib.rs | 14 ++++++-- src/api/comment.rs | 35 +++++++++++++++---- src/api/community.rs | 38 +++++++++++++++++---- src/api/mod.rs | 6 +++- src/api/post.rs | 33 ++++++++++++++---- src/api/site.rs | 27 ++++++++++++--- src/api/user.rs | 47 +++++++++++++++++++++----- src/apub/activity_queue.rs | 8 ++++- src/apub/comment.rs | 34 +++++++++++++++---- src/apub/community.rs | 22 +++++++++--- src/apub/fetcher.rs | 11 ++++-- src/apub/inbox/activities/announce.rs | 9 +++-- src/apub/inbox/activities/create.rs | 8 +++-- src/apub/inbox/activities/delete.rs | 13 +++++-- src/apub/inbox/activities/dislike.rs | 7 ++-- src/apub/inbox/activities/like.rs | 7 ++-- src/apub/inbox/activities/remove.rs | 13 +++++-- src/apub/inbox/activities/undo.rs | 16 ++++++--- src/apub/inbox/activities/update.rs | 8 +++-- src/apub/inbox/community_inbox.rs | 10 ++++-- src/apub/inbox/shared_inbox.rs | 12 +++++-- src/apub/inbox/user_inbox.rs | 6 ++-- src/apub/mod.rs | 9 +++-- src/apub/post.rs | 24 ++++++++++--- src/apub/private_message.rs | 23 ++++++++++--- src/apub/user.rs | 20 ++++++++--- src/code_migrations.rs | 8 +++-- src/main.rs | 8 +++-- src/routes/feeds.rs | 3 +- src/routes/webfinger.rs | 5 ++- src/websocket/chat_server.rs | 9 ++++- 44 files changed, 485 insertions(+), 125 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index f01b84685..f3efdc308 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,5 +1,5 @@ tab_spaces = 2 edition="2018" -# imports_layout="HorizontalVertical" -# merge_imports=true +imports_layout="HorizontalVertical" +merge_imports=true reorder_imports=true diff --git a/lemmy_api_structs/src/site.rs b/lemmy_api_structs/src/site.rs index 8de1ab7ad..b82b325e3 100644 --- a/lemmy_api_structs/src/site.rs +++ b/lemmy_api_structs/src/site.rs @@ -1,6 +1,12 @@ use lemmy_db::{ - category::*, comment_view::*, community_view::*, moderator_views::*, post_view::*, site_view::*, - user::*, user_view::*, + category::*, + comment_view::*, + community_view::*, + moderator_views::*, + post_view::*, + site_view::*, + user::*, + user_view::*, }; use serde::{Deserialize, Serialize}; diff --git a/lemmy_db/src/activity.rs b/lemmy_db/src/activity.rs index 6a263b2bb..79b185fb7 100644 --- a/lemmy_db/src/activity.rs +++ b/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; diff --git a/lemmy_db/src/comment.rs b/lemmy_db/src/comment.rs index 3e24346d9..bc2a574ec 100644 --- a/lemmy_db/src/comment.rs +++ b/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 for CommentSaved { #[cfg(test)] mod tests { use crate::{ - comment::*, community::*, post::*, tests::establish_unpooled_connection, user::*, Crud, - ListingType, SortType, + comment::*, + community::*, + post::*, + tests::establish_unpooled_connection, + user::*, + Crud, + ListingType, + SortType, }; #[test] diff --git a/lemmy_db/src/comment_view.rs b/lemmy_db/src/comment_view.rs index 5ef5223af..a5eb8e6d4 100644 --- a/lemmy_db/src/comment_view.rs +++ b/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, - user::*, Crud, Likeable, *, + comment::*, + comment_view::*, + community::*, + post::*, + tests::establish_unpooled_connection, + user::*, + Crud, + Likeable, + *, }; #[test] diff --git a/lemmy_db/src/community.rs b/lemmy_db/src/community.rs index dbb0cfede..918d44f15 100644 --- a/lemmy_db/src/community.rs +++ b/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, *}; diff --git a/lemmy_db/src/moderator.rs b/lemmy_db/src/moderator.rs index a0947c831..aaed1314d 100644 --- a/lemmy_db/src/moderator.rs +++ b/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_remove_community, mod_remove_post, mod_sticky_post, + mod_add, + 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 for ModAdd { #[cfg(test)] mod tests { use crate::{ - comment::*, community::*, moderator::*, post::*, tests::establish_unpooled_connection, user::*, - ListingType, SortType, + comment::*, + community::*, + moderator::*, + post::*, + tests::establish_unpooled_connection, + user::*, + ListingType, + SortType, }; // use Crud; diff --git a/lemmy_db/src/password_reset_request.rs b/lemmy_db/src/password_reset_request.rs index 69281b742..fde47c98e 100644 --- a/lemmy_db/src/password_reset_request.rs +++ b/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, - ListingType, SortType, + password_reset_request::PasswordResetRequest, + tests::establish_unpooled_connection, + Crud, + ListingType, + SortType, }; #[test] diff --git a/lemmy_db/src/post.rs b/lemmy_db/src/post.rs index a8c65bf22..7d13eb806 100644 --- a/lemmy_db/src/post.rs +++ b/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 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] diff --git a/lemmy_db/src/post_view.rs b/lemmy_db/src/post_view.rs index 4d6455cb5..e88a80e30 100644 --- a/lemmy_db/src/post_view.rs +++ b/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, - Likeable, *, + community::*, + post::*, + post_view::*, + tests::establish_unpooled_connection, + user::*, + Crud, + Likeable, + *, }; #[test] diff --git a/lemmy_db/src/private_message.rs b/lemmy_db/src/private_message.rs index 012f7356c..2484ebeab 100644 --- a/lemmy_db/src/private_message.rs +++ b/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] diff --git a/lemmy_db/src/user.rs b/lemmy_db/src/user.rs index a145999f6..986701c43 100644 --- a/lemmy_db/src/user.rs +++ b/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, }; diff --git a/lemmy_db/src/user_mention.rs b/lemmy_db/src/user_mention.rs index 79e722cd7..bcb3a1437 100644 --- a/lemmy_db/src/user_mention.rs +++ b/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::*, - user_mention::*, ListingType, SortType, + comment::*, + community::*, + post::*, + tests::establish_unpooled_connection, + user::*, + user_mention::*, + ListingType, + SortType, }; #[test] diff --git a/lemmy_utils/src/lib.rs b/lemmy_utils/src/lib.rs index 0ce38e3dd..d28218282 100644 --- a/lemmy_utils/src/lib.rs +++ b/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, - remove_slurs, scrape_text_for_mentions, slur_check, slurs_vec_to_str, + is_valid_community_name, + is_valid_post_title, + is_valid_preferred_username, + is_valid_username, + remove_slurs, + scrape_text_for_mentions, + slur_check, + slurs_vec_to_str, }; #[test] diff --git a/src/api/comment.rs b/src/api/comment.rs index 9d314fb4e..e7b4080eb 100644 --- a/src/api/comment.rs +++ b/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, - Likeable, ListingType, Saveable, SortType, + comment::*, + 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, - APIError, ConnectionId, EndpointType, LemmyError, MentionData, + make_apub_endpoint, + remove_slurs, + scrape_text_for_mentions, + send_email, + settings::Settings, + APIError, + ConnectionId, + EndpointType, + LemmyError, + MentionData, }; use log::error; use std::str::FromStr; diff --git a/src/api/community.rs b/src/api/community.rs index 44148b194..6fb67b330 100644 --- a/src/api/community.rs +++ b/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, - is_mod_or_admin, Perform, + check_slurs, + 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::*, - diesel_option_overwrite, moderator::*, naive_now, post::Post, site::*, user_view::*, Bannable, - Crud, Followable, Joinable, SortType, + comment::Comment, + comment_view::CommentQueryBuilder, + 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, - naive_from_unix, APIError, ConnectionId, EndpointType, LemmyError, + generate_actor_keypair, + is_valid_community_name, + location_info, + make_apub_endpoint, + naive_from_unix, + APIError, + ConnectionId, + EndpointType, + LemmyError, }; use std::str::FromStr; diff --git a/src/api/mod.rs b/src/api/mod.rs index e8b86db6c..a1b8c188d 100644 --- a/src/api/mod.rs +++ b/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}; diff --git a/src/api/post.rs b/src/api/post.rs index a74737f4f..9e1e97d51 100644 --- a/src/api/post.rs +++ b/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, - is_mod_or_admin, Perform, + check_community_ban, + 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::*, - Crud, Likeable, ListingType, Saveable, SortType, + comment_view::*, + 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; diff --git a/src/api/site.rs b/src/api/site.rs index 28192ae21..8bcc4b77a 100644 --- a/src/api/site.rs +++ b/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::*, - moderator_views::*, naive_now, post_view::*, site::*, site_view::*, user_view::*, Crud, - SearchType, SortType, + category::*, + comment_view::*, + 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}; diff --git a/src/api/user.rs b/src/api/user.rs index 71e6c8626..1a71b3aa0 100644 --- a/src/api/user.rs +++ b/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, - 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, + comment::*, + comment_view::*, + community::*, + 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, - location_info, make_apub_endpoint, naive_from_unix, remove_slurs, send_email, settings::Settings, - APIError, ConnectionId, EndpointType, LemmyError, + generate_actor_keypair, + generate_random_string, + 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; diff --git a/src/apub/activity_queue.rs b/src/apub/activity_queue.rs index e3461736d..008846bf3 100644 --- a/src/apub/activity_queue.rs +++ b/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; diff --git a/src/apub/comment.rs b/src/apub/comment.rs index 1bb928c69..8c416369f 100644 --- a/src/apub/comment.rs +++ b/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; diff --git a/src/apub/community.rs b/src/apub/community.rs index c166ce33e..8d9b4dc1c 100644 --- a/src/apub/community.rs +++ b/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}, diff --git a/src/apub/fetcher.rs b/src/apub/fetcher.rs index 476d64c08..d45165777 100644 --- a/src/apub/fetcher.rs +++ b/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; diff --git a/src/apub/inbox/activities/announce.rs b/src/apub/inbox/activities/announce.rs index f75826b72..47607a05d 100644 --- a/src/apub/inbox/activities/announce.rs +++ b/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, - remove::receive_remove, undo::receive_undo, update::receive_update, + create::receive_create, + 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}, }, diff --git a/src/apub/inbox/activities/create.rs b/src/apub/inbox/activities/create.rs index a129681f7..a39152047 100644 --- a/src/apub/inbox/activities/create.rs +++ b/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::{ diff --git a/src/apub/inbox/activities/delete.rs b/src/apub/inbox/activities/delete.rs index a20f57e43..70bf37616 100644 --- a/src/apub/inbox/activities/delete.rs +++ b/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}, diff --git a/src/apub/inbox/activities/dislike.rs b/src/apub/inbox/activities/dislike.rs index a0a2bc19a..599389b18 100644 --- a/src/apub/inbox/activities/dislike.rs +++ b/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::{ diff --git a/src/apub/inbox/activities/like.rs b/src/apub/inbox/activities/like.rs index 08eddd5ff..2cb95521e 100644 --- a/src/apub/inbox/activities/like.rs +++ b/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::{ diff --git a/src/apub/inbox/activities/remove.rs b/src/apub/inbox/activities/remove.rs index 9465b86e8..846842d4e 100644 --- a/src/apub/inbox/activities/remove.rs +++ b/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}, diff --git a/src/apub/inbox/activities/undo.rs b/src/apub/inbox/activities/undo.rs index 78139076b..0b695d32e 100644 --- a/src/apub/inbox/activities/undo.rs +++ b/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}; diff --git a/src/apub/inbox/activities/update.rs b/src/apub/inbox/activities/update.rs index 335ca1d9f..eb1b67f1d 100644 --- a/src/apub/inbox/activities/update.rs +++ b/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::{ diff --git a/src/apub/inbox/community_inbox.rs b/src/apub/inbox/community_inbox.rs index d051497ed..0631f9391 100644 --- a/src/apub/inbox/community_inbox.rs +++ b/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, - insert_activity, ActorType, + check_is_apub_id_valid, + extensions::signatures::verify, + fetcher::get_or_fetch_and_upsert_user, + insert_activity, + ActorType, }, - blocking, LemmyContext, + blocking, + LemmyContext, }; use activitystreams::{ activity::{ActorAndObject, Follow, Undo}, diff --git a/src/apub/inbox/shared_inbox.rs b/src/apub/inbox/shared_inbox.rs index 9c1aec50a..da7951082 100644 --- a/src/apub/inbox/shared_inbox.rs +++ b/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, - dislike::receive_dislike, like::receive_like, remove::receive_remove, undo::receive_undo, + announce::receive_announce, + create::receive_create, + delete::receive_delete, + dislike::receive_dislike, + like::receive_like, + remove::receive_remove, + undo::receive_undo, update::receive_update, }, insert_activity, diff --git a/src/apub/inbox/user_inbox.rs b/src/apub/inbox/user_inbox.rs index a8a4edfb0..7ea95833e 100644 --- a/src/apub/inbox/user_inbox.rs +++ b/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; diff --git a/src/apub/mod.rs b/src/apub/mod.rs index d2c6f61e7..b3b161c7d 100644 --- a/src/apub/mod.rs +++ b/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; diff --git a/src/apub/post.rs b/src/apub/post.rs index baaf8bd9a..a54b8f6a3 100644 --- a/src/apub/post.rs +++ b/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::*, diff --git a/src/apub/private_message.rs b/src/apub/private_message.rs index 0fff08dc0..5563aef36 100644 --- a/src/apub/private_message.rs +++ b/src/apub/private_message.rs @@ -1,15 +1,28 @@ use crate::{ apub::{ - activities::generate_activity_id, activity_queue::send_activity, check_actor_domain, - check_is_apub_id_valid, create_tombstone, fetcher::get_or_fetch_and_upsert_user, - insert_activity, ActorType, ApubObjectType, FromApub, ToApub, + activities::generate_activity_id, + activity_queue::send_activity, + 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::*, diff --git a/src/apub/user.rs b/src/apub/user.rs index 8b1acc4a5..5522a3413 100644 --- a/src/apub/user.rs +++ b/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, - create_apub_response, fetcher::get_or_fetch_and_upsert_actor, insert_activity, ActorType, - FromApub, PersonExt, ToApub, + activities::generate_activity_id, + activity_queue::send_activity, + 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}, diff --git a/src/code_migrations.rs b/src/code_migrations.rs index 40ae17147..e59aa88c7 100644 --- a/src/code_migrations.rs +++ b/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, - EndpointType, LemmyError, + generate_actor_keypair, + get_apub_protocol_string, + make_apub_endpoint, + settings::Settings, + EndpointType, + LemmyError, }; use log::info; diff --git a/src/main.rs b/src/main.rs index fe2f46d93..511af1174 100644 --- a/src/main.rs +++ b/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, - routes::*, websocket::chat_server::ChatServer, LemmyContext, + apub::activity_queue::create_activity_queue, + blocking, + code_migrations::run_advanced_migrations, + routes::*, + websocket::chat_server::ChatServer, + LemmyContext, }; use lemmy_utils::{settings::Settings, LemmyError, CACHE_CONTROL_REGEX}; use reqwest::Client; diff --git a/src/routes/feeds.rs b/src/routes/feeds.rs index 20251876a..9bfe4cb6f 100644 --- a/src/routes/feeds.rs +++ b/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}; diff --git a/src/routes/webfinger.rs b/src/routes/webfinger.rs index 4cbec5ca2..22861434c 100644 --- a/src/routes/webfinger.rs +++ b/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}; diff --git a/src/websocket/chat_server.rs b/src/websocket/chat_server.rs index 43e4e5b69..b8066eece 100644 --- a/src/websocket/chat_server.rs +++ b/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;