@ -44,33 +44,13 @@ use rosetta_i18n::{Language, LanguageId};
use std ::str ::FromStr ; use std ::str ::FromStr ;
use tracing ::warn ; use tracing ::warn ;
pub async fn blocking < F , T > ( pool : & DbPool , f : F ) -> Result < T , LemmyError >
where
F : FnOnce ( & mut diesel ::PgConnection ) -> T + Send + ' static ,
T : Send + ' static ,
{
let pool = pool . clone ( ) ;
let blocking_span = tracing ::info_span ! ( "blocking operation" ) ;
actix_web ::web ::block ( move | | {
let entered = blocking_span . enter ( ) ;
let mut conn = pool . get ( ) ? ;
let res = ( f ) ( & mut conn ) ;
drop ( entered ) ;
Ok ( res ) as Result < T , LemmyError >
} )
. await ?
}
#[ tracing::instrument(skip_all) ] #[ tracing::instrument(skip_all) ]
pub async fn is_mod_or_admin ( pub async fn is_mod_or_admin (
pool : & DbPool , pool : & DbPool ,
person_id : PersonId , person_id : PersonId ,
community_id : CommunityId , community_id : CommunityId ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
let is_mod_or_admin = blocking ( pool , move | conn | { let is_mod_or_admin = CommunityView ::is_mod_or_admin ( pool , person_id , community_id ) . await ? ;
CommunityView ::is_mod_or_admin ( conn , person_id , community_id )
} )
. await ? ;
if ! is_mod_or_admin { if ! is_mod_or_admin {
return Err ( LemmyError ::from_message ( "not_a_mod_or_admin" ) ) ; return Err ( LemmyError ::from_message ( "not_a_mod_or_admin" ) ) ;
} }
@ -86,8 +66,8 @@ pub fn is_admin(local_user_view: &LocalUserView) -> Result<(), LemmyError> {
#[ tracing::instrument(skip_all) ] #[ tracing::instrument(skip_all) ]
pub async fn get_post ( post_id : PostId , pool : & DbPool ) -> Result < Post , LemmyError > { pub async fn get_post ( post_id : PostId , pool : & DbPool ) -> Result < Post , LemmyError > {
blocking( pool , move | conn | Post ::read ( conn , post_id ) ) Post::read ( pool , post_id )
. await ? . await
. map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_find_post" ) ) . map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_find_post" ) )
} }
@ -99,11 +79,9 @@ pub async fn mark_post_as_read(
) -> Result < PostRead , LemmyError > { ) -> Result < PostRead , LemmyError > {
let post_read_form = PostReadForm { post_id , person_id } ; let post_read_form = PostReadForm { post_id , person_id } ;
blocking ( pool , move | conn | { PostRead ::mark_as_read ( pool , & post_read_form )
PostRead ::mark_as_read ( conn , & post_read_form ) . await
} ) . map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_mark_post_as_read" ) )
. await ?
. map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_mark_post_as_read" ) )
} }
#[ tracing::instrument(skip_all) ] #[ tracing::instrument(skip_all) ]
@ -114,11 +92,9 @@ pub async fn mark_post_as_unread(
) -> Result < usize , LemmyError > { ) -> Result < usize , LemmyError > {
let post_read_form = PostReadForm { post_id , person_id } ; let post_read_form = PostReadForm { post_id , person_id } ;
blocking ( pool , move | conn | { PostRead ::mark_as_unread ( pool , & post_read_form )
PostRead ::mark_as_unread ( conn , & post_read_form ) . await
} ) . map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_mark_post_as_read" ) )
. await ?
. map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_mark_post_as_read" ) )
} }
#[ tracing::instrument(skip_all) ] #[ tracing::instrument(skip_all) ]
@ -131,8 +107,7 @@ pub async fn get_local_user_view_from_jwt(
. map_err ( | e | e . with_message ( "not_logged_in" ) ) ? . map_err ( | e | e . with_message ( "not_logged_in" ) ) ?
. claims ; . claims ;
let local_user_id = LocalUserId ( claims . sub ) ; let local_user_id = LocalUserId ( claims . sub ) ;
let local_user_view = let local_user_view = LocalUserView ::read ( pool , local_user_id ) . await ? ;
blocking ( pool , move | conn | LocalUserView ::read ( conn , local_user_id ) ) . await ? ? ;
check_user_valid ( check_user_valid (
local_user_view . person . banned , local_user_view . person . banned ,
local_user_view . person . ban_expires , local_user_view . person . ban_expires ,
@ -181,10 +156,7 @@ pub async fn get_local_user_settings_view_from_jwt_opt(
. map_err ( | e | e . with_message ( "not_logged_in" ) ) ? . map_err ( | e | e . with_message ( "not_logged_in" ) ) ?
. claims ; . claims ;
let local_user_id = LocalUserId ( claims . sub ) ; let local_user_id = LocalUserId ( claims . sub ) ;
let local_user_view = blocking ( pool , move | conn | { let local_user_view = LocalUserSettingsView ::read ( pool , local_user_id ) . await ? ;
LocalUserSettingsView ::read ( conn , local_user_id )
} )
. await ? ? ;
check_user_valid ( check_user_valid (
local_user_view . person . banned , local_user_view . person . banned ,
local_user_view . person . ban_expires , local_user_view . person . ban_expires ,
@ -222,9 +194,10 @@ pub async fn check_community_ban(
community_id : CommunityId , community_id : CommunityId ,
pool : & DbPool , pool : & DbPool ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
let is_banned = let is_banned = CommunityPersonBanView ::get ( pool , person_id , community_id )
move | conn : & mut _ | CommunityPersonBanView ::get ( conn , person_id , community_id ) . is_ok ( ) ; . await
if blocking ( pool , is_banned ) . await ? { . is_ok ( ) ;
if is_banned {
Err ( LemmyError ::from_message ( "community_ban" ) ) Err ( LemmyError ::from_message ( "community_ban" ) )
} else { } else {
Ok ( ( ) ) Ok ( ( ) )
@ -236,8 +209,8 @@ pub async fn check_community_deleted_or_removed(
community_id : CommunityId , community_id : CommunityId ,
pool : & DbPool , pool : & DbPool ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
let community = blocking( pool , move | conn | Community ::read ( conn , community_id ) ) let community = Community::read ( pool , community_id )
. await ? . await
. map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_find_community" ) ) ? ; . map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_find_community" ) ) ? ;
if community . deleted | | community . removed { if community . deleted | | community . removed {
Err ( LemmyError ::from_message ( "deleted" ) ) Err ( LemmyError ::from_message ( "deleted" ) )
@ -260,8 +233,10 @@ pub async fn check_person_block(
potential_blocker_id : PersonId , potential_blocker_id : PersonId ,
pool : & DbPool , pool : & DbPool ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
let is_blocked = move | conn : & mut _ | PersonBlock ::read ( conn , potential_blocker_id , my_id ) . is_ok ( ) ; let is_blocked = PersonBlock ::read ( pool , potential_blocker_id , my_id )
if blocking ( pool , is_blocked ) . await ? { . await
. is_ok ( ) ;
if is_blocked {
Err ( LemmyError ::from_message ( "person_block" ) ) Err ( LemmyError ::from_message ( "person_block" ) )
} else { } else {
Ok ( ( ) ) Ok ( ( ) )
@ -294,9 +269,9 @@ pub async fn build_federated_instances(
) -> Result < Option < FederatedInstances > , LemmyError > { ) -> Result < Option < FederatedInstances > , LemmyError > {
if local_site . federation_enabled { if local_site . federation_enabled {
// TODO I hate that this requires 3 queries
// TODO I hate that this requires 3 queries
let linked = blocking( pool , Instance::linked . await ? ? ; let linked = linked (pool ). await ? ;
let allowed = blocking( pool , Instance::allowlist . await ? ? ; let allowed = allowlist (pool ). await ? ;
let blocked = blocking( pool , Instance::blocklist . await ? ? ; let blocked = blocklist (pool ). await ? ;
// These can return empty vectors, so convert them to options
// These can return empty vectors, so convert them to options
let allowed = ( ! allowed . is_empty ( ) ) . then ( | | allowed ) ; let allowed = ( ! allowed . is_empty ( ) ) . then ( | | allowed ) ;
@ -374,10 +349,7 @@ pub async fn send_password_reset_email(
// Insert the row
// Insert the row
let token2 = token . clone ( ) ; let token2 = token . clone ( ) ;
let local_user_id = user . local_user . id ; let local_user_id = user . local_user . id ;
blocking ( pool , move | conn | { PasswordResetRequest ::create_token ( pool , local_user_id , & token2 ) . await ? ;
PasswordResetRequest ::create_token ( conn , local_user_id , & token2 )
} )
. await ? ? ;
let email = & user . local_user . email . to_owned ( ) . expect ( "email" ) ; let email = & user . local_user . email . to_owned ( ) . expect ( "email" ) ;
let lang = get_interface_language ( user ) ; let lang = get_interface_language ( user ) ;
@ -405,7 +377,7 @@ pub async fn send_verification_email(
settings . get_protocol_and_hostname ( ) , settings . get_protocol_and_hostname ( ) ,
& form . verification_token & form . verification_token
) ; ) ;
blocking( pool , move | conn | EmailVerification::create ( conn , & form ) ) .await ? ? ; create ( pool , & form ) await ? ;
let lang = get_interface_language ( user ) ; let lang = get_interface_language ( user ) ;
let subject = lang . verify_email_subject ( & settings . hostname ) ; let subject = lang . verify_email_subject ( & settings . hostname ) ;
@ -491,10 +463,7 @@ pub async fn send_new_applicant_email_to_admins(
settings : & Settings , settings : & Settings ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
// Collect the admins with emails
// Collect the admins with emails
let admins = blocking ( pool , move | conn | { let admins = LocalUserSettingsView ::list_admins_with_emails ( pool ) . await ? ;
LocalUserSettingsView ::list_admins_with_emails ( conn )
} )
. await ? ? ;
let applications_link = & format! ( let applications_link = & format! (
"{}/registration_applications" , "{}/registration_applications" ,
@ -522,10 +491,7 @@ pub async fn check_registration_application(
{ {
// Fetch the registration, see if its denied
// Fetch the registration, see if its denied
let local_user_id = local_user_view . local_user . id ; let local_user_id = local_user_view . local_user . id ;
let registration = blocking ( pool , move | conn | { let registration = RegistrationApplication ::find_by_local_user_id ( pool , local_user_id ) . await ? ;
RegistrationApplication ::find_by_local_user_id ( conn , local_user_id )
} )
. await ? ? ;
if let Some ( deny_reason ) = registration . deny_reason { if let Some ( deny_reason ) = registration . deny_reason {
let lang = get_interface_language ( local_user_view ) ; let lang = get_interface_language ( local_user_view ) ;
let registration_denied_message = format! ( "{}: {}" , lang . registration_denied ( ) , & deny_reason ) ; let registration_denied_message = format! ( "{}: {}" , lang . registration_denied ( ) , & deny_reason ) ;
@ -554,10 +520,7 @@ pub async fn purge_image_posts_for_person(
settings : & Settings , settings : & Settings ,
client : & ClientWithMiddleware , client : & ClientWithMiddleware ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
let posts = blocking ( pool , move | conn : & mut _ | { let posts = Post ::fetch_pictrs_posts_for_creator ( pool , banned_person_id ) . await ? ;
Post ::fetch_pictrs_posts_for_creator ( conn , banned_person_id )
} )
. await ? ? ;
for post in posts { for post in posts {
if let Some ( url ) = post . url { if let Some ( url ) = post . url {
purge_image_from_pictrs ( client , settings , & url ) . await . ok ( ) ; purge_image_from_pictrs ( client , settings , & url ) . await . ok ( ) ;
@ -569,10 +532,7 @@ pub async fn purge_image_posts_for_person(
} }
} }
blocking ( pool , move | conn | { Post ::remove_pictrs_post_images_and_thumbnails_for_creator ( pool , banned_person_id ) . await ? ;
Post ::remove_pictrs_post_images_and_thumbnails_for_creator ( conn , banned_person_id )
} )
. await ? ? ;
Ok ( ( ) ) Ok ( ( ) )
} }
@ -583,10 +543,7 @@ pub async fn purge_image_posts_for_community(
settings : & Settings , settings : & Settings ,
client : & ClientWithMiddleware , client : & ClientWithMiddleware ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
let posts = blocking ( pool , move | conn : & mut _ | { let posts = Post ::fetch_pictrs_posts_for_community ( pool , banned_community_id ) . await ? ;
Post ::fetch_pictrs_posts_for_community ( conn , banned_community_id )
} )
. await ? ? ;
for post in posts { for post in posts {
if let Some ( url ) = post . url { if let Some ( url ) = post . url {
purge_image_from_pictrs ( client , settings , & url ) . await . ok ( ) ; purge_image_from_pictrs ( client , settings , & url ) . await . ok ( ) ;
@ -598,10 +555,7 @@ pub async fn purge_image_posts_for_community(
} }
} }
blocking ( pool , move | conn | { Post ::remove_pictrs_post_images_and_thumbnails_for_community ( pool , banned_community_id ) . await ? ;
Post ::remove_pictrs_post_images_and_thumbnails_for_community ( conn , banned_community_id )
} )
. await ? ? ;
Ok ( ( ) ) Ok ( ( ) )
} }
@ -613,7 +567,7 @@ pub async fn remove_user_data(
client : & ClientWithMiddleware , client : & ClientWithMiddleware ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
// Purge user images
// Purge user images
let person = blocking( pool , move | conn | Person ::read ( conn , banned_person_id ) ) .await ? ? ; let person = Person::read ( pool , banned_person_id ) await ? ;
if let Some ( avatar ) = person . avatar { if let Some ( avatar ) = person . avatar {
purge_image_from_pictrs ( client , settings , & avatar ) purge_image_from_pictrs ( client , settings , & avatar )
. await . await
@ -626,23 +580,18 @@ pub async fn remove_user_data(
} }
// Update the fields to None
// Update the fields to None
blocking ( pool , move | conn | { Person ::update (
Person ::update ( pool ,
conn , banned_person_id ,
banned_person_id , & PersonUpdateForm ::builder ( )
& PersonUpdateForm ::builder ( ) . avatar ( Some ( None ) )
. avatar ( Some ( None ) ) . banner ( Some ( None ) )
. banner ( Some ( None ) ) . build ( ) ,
. build ( ) , )
) . await ? ;
} )
. await ? ? ;
// Posts
// Posts
blocking ( pool , move | conn : & mut _ | { Post ::update_removed_for_creator ( pool , banned_person_id , None , true ) . await ? ;
Post ::update_removed_for_creator ( conn , banned_person_id , None , true )
} )
. await ? ? ;
// Purge image posts
// Purge image posts
purge_image_posts_for_person ( banned_person_id , pool , settings , client ) . await ? ; purge_image_posts_for_person ( banned_person_id , pool , settings , client ) . await ? ;
@ -650,10 +599,7 @@ pub async fn remove_user_data(
// Communities
// Communities
// Remove all communities where they're the top mod
// Remove all communities where they're the top mod
// for now, remove the communities manually
// for now, remove the communities manually
let first_mod_communities = blocking ( pool , move | conn : & mut _ | { let first_mod_communities = CommunityModeratorView ::get_community_first_mods ( pool ) . await ? ;
CommunityModeratorView ::get_community_first_mods ( conn )
} )
. await ? ? ;
// Filter to only this banned users top communities
// Filter to only this banned users top communities
let banned_user_first_communities : Vec < CommunityModeratorView > = first_mod_communities let banned_user_first_communities : Vec < CommunityModeratorView > = first_mod_communities
@ -663,14 +609,12 @@ pub async fn remove_user_data(
for first_mod_community in banned_user_first_communities { for first_mod_community in banned_user_first_communities {
let community_id = first_mod_community . community . id ; let community_id = first_mod_community . community . id ;
blocking ( pool , move | conn | { Community ::update (
Community ::update ( pool ,
conn , community_id ,
community_id , & CommunityUpdateForm ::builder ( ) . removed ( Some ( true ) ) . build ( ) ,
& CommunityUpdateForm ::builder ( ) . removed ( Some ( true ) ) . build ( ) , )
) . await ? ;
} )
. await ? ? ;
// Delete the community images
// Delete the community images
if let Some ( icon ) = first_mod_community . community . icon { if let Some ( icon ) = first_mod_community . community . icon {
@ -682,24 +626,19 @@ pub async fn remove_user_data(
. ok ( ) ; . ok ( ) ;
} }
// Update the fields to None
// Update the fields to None
blocking ( pool , move | conn | { Community ::update (
Community ::update ( pool ,
conn , community_id ,
community_id , & CommunityUpdateForm ::builder ( )
& CommunityUpdateForm ::builder ( ) . icon ( Some ( None ) )
. icon ( Some ( None ) ) . banner ( Some ( None ) )
. banner ( Some ( None ) ) . build ( ) ,
. build ( ) , )
) . await ? ;
} )
. await ? ? ;
} }
// Comments
// Comments
blocking ( pool , move | conn : & mut _ | { Comment ::update_removed_for_creator ( pool , banned_person_id , true ) . await ? ;
Comment ::update_removed_for_creator ( conn , banned_person_id , true )
} )
. await ? ? ;
Ok ( ( ) ) Ok ( ( ) )
} }
@ -710,34 +649,27 @@ pub async fn remove_user_data_in_community(
pool : & DbPool , pool : & DbPool ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
// Posts
// Posts
blocking ( pool , move | conn | { Post ::update_removed_for_creator ( pool , banned_person_id , Some ( community_id ) , true ) . await ? ;
Post ::update_removed_for_creator ( conn , banned_person_id , Some ( community_id ) , true )
} )
. await ? ? ;
// Comments
// Comments
// TODO Diesel doesn't allow updates with joins, so this has to be a loop
// TODO Diesel doesn't allow updates with joins, so this has to be a loop
let comments = blocking ( pool , move | conn | { let comments = CommentQuery ::builder ( )
CommentQuery ::builder ( ) . pool ( pool )
. conn ( conn ) . creator_id ( Some ( banned_person_id ) )
. creator_id ( Some ( banned_person_id ) ) . community_id ( Some ( community_id ) )
. community_id ( Some ( community_id ) ) . limit ( Some ( i64 ::MAX ) )
. limit ( Some ( i64 ::MAX ) ) . build ( )
. build ( ) . list ( )
. list ( ) . await ? ;
} )
. await ? ? ;
for comment_view in & comments { for comment_view in & comments {
let comment_id = comment_view . comment . id ; let comment_id = comment_view . comment . id ;
blocking ( pool , move | conn | { Comment ::update (
Comment ::update ( pool ,
conn , comment_id ,
comment_id , & CommentUpdateForm ::builder ( ) . removed ( Some ( true ) ) . build ( ) ,
& CommentUpdateForm ::builder ( ) . removed ( Some ( true ) ) . build ( ) , )
) . await ? ;
} )
. await ? ? ;
} }
Ok ( ( ) ) Ok ( ( ) )
@ -750,7 +682,7 @@ pub async fn delete_user_account(
client : & ClientWithMiddleware , client : & ClientWithMiddleware ,
) -> Result < ( ) , LemmyError > { ) -> Result < ( ) , LemmyError > {
// Delete their images
// Delete their images
let person = blocking( pool , move | conn | Person ::read ( conn , person_id ) ) .await ? ? ; let person = Person::read ( pool , person_id ) await ? ;
if let Some ( avatar ) = person . avatar { if let Some ( avatar ) = person . avatar {
purge_image_from_pictrs ( client , settings , & avatar ) purge_image_from_pictrs ( client , settings , & avatar )
. await . await
@ -764,21 +696,19 @@ pub async fn delete_user_account(
// No need to update avatar and banner, those are handled in Person::delete_account
// No need to update avatar and banner, those are handled in Person::delete_account
// Comments
// Comments
let permadelete = move | conn : & mut _ | Comment ::permadelete_for_creator ( conn , person_id ) ; Comment ::permadelete_for_creator ( pool , person_id )
blocking ( pool , permadelete ) . await
. await ?
. map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_update_comment" ) ) ? ; . map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_update_comment" ) ) ? ;
// Posts
// Posts
let permadelete = move | conn : & mut _ | Post ::permadelete_for_creator ( conn , person_id ) ; Post ::permadelete_for_creator ( pool , person_id )
blocking ( pool , permadelete ) . await
. await ?
. map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_update_post" ) ) ? ; . map_err ( | e | LemmyError ::from_error_message ( e , "couldnt_update_post" ) ) ? ;
// Purge image posts
// Purge image posts
purge_image_posts_for_person ( person_id , pool , settings , client ) . await ? ; purge_image_posts_for_person ( person_id , pool , settings , client ) . await ? ;
blocking( pool , move | conn | Person ::delete_account ( conn , person_id ) ) .await ? ? ; Person::delete_account ( pool , person_id ) await ? ;
Ok ( ( ) ) Ok ( ( ) )
} }
Dessalines
2 years ago
committed by
GitHub