gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start over

pull/3420/head
dull b 2023-07-05 01:51:17 +00:00
parent 7aeeec6810
commit fb147b778b
216 changed files with 2264 additions and 2726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/api/src/comment/distinguish.rs
View File

@ -22,18 +22,18 @@ impl Perform for DistinguishComment {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let comment_id = data.comment_id;
let orig_comment = CommentView::read(context.conn().await?, comment_id, None).await?;
let orig_comment = CommentView::read(context.pool(), comment_id, None).await?;
check_community_ban(
local_user_view.person.id,
orig_comment.community.id,
context.conn().await?,
context.pool(),
)
.await?;
// Verify that only a mod or admin can distinguish a comment
is_mod_or_admin(
context.conn().await?,
context.pool(),
local_user_view.person.id,
orig_comment.community.id,
)
@ -44,14 +44,13 @@ impl Perform for DistinguishComment {
let form = CommentUpdateForm::builder()
.distinguished(Some(data.distinguished))
.build();
Comment::update(context.conn().await?, comment_id, &form)
Comment::update(context.pool(), comment_id, &form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
let comment_id = data.comment_id;
let person_id = local_user_view.person.id;
let comment_view =
CommentView::read(context.conn().await?, comment_id, Some(person_id)).await?;
let comment_view = CommentView::read(context.pool(), comment_id, Some(person_id)).await?;
Ok(CommentResponse {
comment_view,

16
crates/api/src/comment/like.rs
View File

@ -25,7 +25,7 @@ impl Perform for CreateCommentLike {
#[tracing::instrument(skip(context))]
async fn perform(&self, context: &Data<LemmyContext>) -> Result<CommentResponse, LemmyError> {
let data: &CreateCommentLike = self;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let mut recipient_ids = Vec::<LocalUserId>::new();
@ -34,22 +34,20 @@ impl Perform for CreateCommentLike {
check_downvotes_enabled(data.score, &local_site)?;
let comment_id = data.comment_id;
let orig_comment = CommentView::read(context.conn().await?, comment_id, None).await?;
let orig_comment = CommentView::read(context.pool(), comment_id, None).await?;
check_community_ban(
local_user_view.person.id,
orig_comment.community.id,
context.conn().await?,
context.pool(),
)
.await?;
// Add parent poster or commenter to recipients
let comment_reply = CommentReply::read_by_comment(context.conn().await?, comment_id).await;
let comment_reply = CommentReply::read_by_comment(context.pool(), comment_id).await;
if let Ok(reply) = comment_reply {
let recipient_id = reply.recipient_id;
if let Ok(local_recipient) =
LocalUserView::read_person(context.conn().await?, recipient_id).await
{
if let Ok(local_recipient) = LocalUserView::read_person(context.pool(), recipient_id).await {
recipient_ids.push(local_recipient.local_user.id);
}
}
@ -64,12 +62,12 @@ impl Perform for CreateCommentLike {
// Remove any likes first
let person_id = local_user_view.person.id;
CommentLike::remove(context.conn().await?, person_id, comment_id).await?;
CommentLike::remove(context.pool(), person_id, comment_id).await?;
// Only add the like if the score isnt 0
let do_add = like_form.score != 0 && (like_form.score == 1 || like_form.score == -1);
if do_add {
CommentLike::like(context.conn().await?, &like_form)
CommentLike::like(context.pool(), &like_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_like_comment"))?;
}

7
crates/api/src/comment/save.rs
View File

@ -27,19 +27,18 @@ impl Perform for SaveComment {
};
if data.save {
CommentSaved::save(context.conn().await?, &comment_saved_form)
CommentSaved::save(context.pool(), &comment_saved_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_save_comment"))?;
} else {
CommentSaved::unsave(context.conn().await?, &comment_saved_form)
CommentSaved::unsave(context.pool(), &comment_saved_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_save_comment"))?;
}
let comment_id = data.comment_id;
let person_id = local_user_view.person.id;
let comment_view =
CommentView::read(context.conn().await?, comment_id, Some(person_id)).await?;
let comment_view = CommentView::read(context.pool(), comment_id, Some(person_id)).await?;
Ok(CommentResponse {
comment_view,

13
crates/api/src/comment_report/create.rs
View File

@ -27,16 +27,16 @@ impl Perform for CreateCommentReport {
) -> Result<CommentReportResponse, LemmyError> {
let data: &CreateCommentReport = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let reason = self.reason.trim();
check_report_reason(reason, &local_site)?;
let person_id = local_user_view.person.id;
let comment_id = data.comment_id;
let comment_view = CommentView::read(context.conn().await?, comment_id, None).await?;
let comment_view = CommentView::read(context.pool(), comment_id, None).await?;
check_community_ban(person_id, comment_view.community.id, context.conn().await?).await?;
check_community_ban(person_id, comment_view.community.id, context.pool()).await?;
let report_form = CommentReportForm {
creator_id: person_id,
@ -45,19 +45,18 @@ impl Perform for CreateCommentReport {
reason: reason.to_owned(),
};
let report = CommentReport::report(context.conn().await?, &report_form)
let report = CommentReport::report(context.pool(), &report_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
let comment_report_view =
CommentReportView::read(context.conn().await?, report.id, person_id).await?;
let comment_report_view = CommentReportView::read(context.pool(), report.id, person_id).await?;
// Email the admins
if local_site.reports_email_admins {
send_new_report_email_to_admins(
&comment_report_view.creator.name,
&comment_report_view.comment_creator.name,
context.conn().await?,
context.pool(),
context.settings(),
)
.await?;

2
crates/api/src/comment_report/list.rs
View File

@ -30,7 +30,7 @@ impl Perform for ListCommentReports {
let page = data.page;
let limit = data.limit;
let comment_reports = CommentReportQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.my_person_id(person_id)
.admin(admin)
.community_id(community_id)

11
crates/api/src/comment_report/resolve.rs
View File

@ -24,24 +24,23 @@ impl Perform for ResolveCommentReport {
let report_id = data.report_id;
let person_id = local_user_view.person.id;
let report = CommentReportView::read(context.conn().await?, report_id, person_id).await?;
let report = CommentReportView::read(context.pool(), report_id, person_id).await?;
let person_id = local_user_view.person.id;
is_mod_or_admin(context.conn().await?, person_id, report.community.id).await?;
is_mod_or_admin(context.pool(), person_id, report.community.id).await?;
if data.resolved {
CommentReport::resolve(context.conn().await?, report_id, person_id)
CommentReport::resolve(context.pool(), report_id, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
} else {
CommentReport::unresolve(context.conn().await?, report_id, person_id)
CommentReport::unresolve(context.pool(), report_id, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
}
let report_id = data.report_id;
let comment_report_view =
CommentReportView::read(context.conn().await?, report_id, person_id).await?;
let comment_report_view = CommentReportView::read(context.pool(), report_id, person_id).await?;
Ok(CommentReportResponse {
comment_report_view,

18
crates/api/src/community/add_mod.rs
View File

@ -30,13 +30,8 @@ impl Perform for AddModToCommunity {
let community_id = data.community_id;
// Verify that only mods or admins can add mod
is_mod_or_admin(
context.conn().await?,
local_user_view.person.id,
community_id,
)
.await?;
let community = Community::read(context.conn().await?, community_id).await?;
is_mod_or_admin(context.pool(), local_user_view.person.id, community_id).await?;
let community = Community::read(context.pool(), community_id).await?;
if local_user_view.person.admin && !community.local {
return Err(LemmyError::from_message("not_a_moderator"));
}
@ -47,11 +42,11 @@ impl Perform for AddModToCommunity {
person_id: data.person_id,
};
if data.added {
CommunityModerator::join(context.conn().await?, &community_moderator_form)
CommunityModerator::join(context.pool(), &community_moderator_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
} else {
CommunityModerator::leave(context.conn().await?, &community_moderator_form)
CommunityModerator::leave(context.pool(), &community_moderator_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
}
@ -64,13 +59,12 @@ impl Perform for AddModToCommunity {
removed: Some(!data.added),
};
ModAddCommunity::create(context.conn().await?, &form).await?;
ModAddCommunity::create(context.pool(), &form).await?;
// Note: in case a remote mod is added, this returns the old moderators list, it will only get
// updated once we receive an activity from the community (like `Announce/Add/Moderator`)
let community_id = data.community_id;
let moderators =
CommunityModeratorView::for_community(context.conn().await?, community_id).await?;
let moderators = CommunityModeratorView::for_community(context.pool(), community_id).await?;
Ok(AddModToCommunityResponse { moderators })
}

17
crates/api/src/community/ban.rs
View File

@ -41,12 +41,7 @@ impl Perform for BanFromCommunity {
let expires = data.expires.map(naive_from_unix);
// Verify that only mods or admins can ban
is_mod_or_admin(
context.conn().await?,
local_user_view.person.id,
community_id,
)
.await?;
is_mod_or_admin(context.pool(), local_user_view.person.id, community_id).await?;
is_valid_body_field(&data.reason, false)?;
let community_user_ban_form = CommunityPersonBanForm {
@ -56,7 +51,7 @@ impl Perform for BanFromCommunity {
};
if data.ban {
CommunityPersonBan::ban(context.conn().await?, &community_user_ban_form)
CommunityPersonBan::ban(context.pool(), &community_user_ban_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_user_already_banned"))?;
@ -67,11 +62,11 @@ impl Perform for BanFromCommunity {
pending: false,
};
CommunityFollower::unfollow(context.conn().await?, &community_follower_form)
CommunityFollower::unfollow(context.pool(), &community_follower_form)
.await
.ok();
} else {
CommunityPersonBan::unban(context.conn().await?, &community_user_ban_form)
CommunityPersonBan::unban(context.pool(), &community_user_ban_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_user_already_banned"))?;
}
@ -91,10 +86,10 @@ impl Perform for BanFromCommunity {
expires,
};
ModBanFromCommunity::create(context.conn().await?, &form).await?;
ModBanFromCommunity::create(context.pool(), &form).await?;
let person_id = data.person_id;
let person_view = PersonView::read(context.conn().await?, person_id).await?;
let person_view = PersonView::read(context.pool(), person_id).await?;
Ok(BanFromCommunityResponse {
person_view,

8
crates/api/src/community/block.rs
View File

@ -35,7 +35,7 @@ impl Perform for BlockCommunity {
};
if data.block {
CommunityBlock::block(context.conn().await?, &community_block_form)
CommunityBlock::block(context.pool(), &community_block_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_block_already_exists"))?;
@ -46,17 +46,17 @@ impl Perform for BlockCommunity {
pending: false,
};
CommunityFollower::unfollow(context.conn().await?, &community_follower_form)
CommunityFollower::unfollow(context.pool(), &community_follower_form)
.await
.ok();
} else {
CommunityBlock::unblock(context.conn().await?, &community_block_form)
CommunityBlock::unblock(context.pool(), &community_block_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_block_already_exists"))?;
}
let community_view =
CommunityView::read(context.conn().await?, community_id, Some(person_id), None).await?;
CommunityView::read(context.pool(), community_id, Some(person_id), None).await?;
Ok(BlockCommunityResponse {
blocked: data.block,

21
crates/api/src/community/follow.rs
View File

@ -25,7 +25,7 @@ impl Perform for FollowCommunity {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let community_id = data.community_id;
let community = Community::read(context.conn().await?, community_id).await?;
let community = Community::read(context.pool(), community_id).await?;
let mut community_follower_form = CommunityFollowerForm {
community_id: data.community_id,
person_id: local_user_view.person.id,
@ -34,27 +34,22 @@ impl Perform for FollowCommunity {
if data.follow {
if community.local {
check_community_ban(
local_user_view.person.id,
community_id,
context.conn().await?,
)
.await?;
check_community_deleted_or_removed(community_id, context.conn().await?).await?;
check_community_ban(local_user_view.person.id, community_id, context.pool()).await?;
check_community_deleted_or_removed(community_id, context.pool()).await?;
CommunityFollower::follow(context.conn().await?, &community_follower_form)
CommunityFollower::follow(context.pool(), &community_follower_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
} else {
// Mark as pending, the actual federation activity is sent via `SendActivity` handler
community_follower_form.pending = true;
CommunityFollower::follow(context.conn().await?, &community_follower_form)
CommunityFollower::follow(context.pool(), &community_follower_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
}
}
if !data.follow {
CommunityFollower::unfollow(context.conn().await?, &community_follower_form)
CommunityFollower::unfollow(context.pool(), &community_follower_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
}
@ -62,8 +57,8 @@ impl Perform for FollowCommunity {
let community_id = data.community_id;
let person_id = local_user_view.person.id;
let community_view =
CommunityView::read(context.conn().await?, community_id, Some(person_id), None).await?;
let discussion_languages = CommunityLanguage::read(context.conn().await?, community_id).await?;
CommunityView::read(context.pool(), community_id, Some(person_id), None).await?;
let discussion_languages = CommunityLanguage::read(context.pool(), community_id).await?;
Ok(Self::Response {
community_view,

4
crates/api/src/community/hide.rs
View File

@ -39,11 +39,11 @@ impl Perform for HideCommunity {
};
let community_id = data.community_id;
Community::update(context.conn().await?, community_id, &community_form)
Community::update(context.pool(), community_id, &community_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_community_hidden_status"))?;
ModHideCommunity::create(context.conn().await?, &mod_hide_community_form).await?;
ModHideCommunity::create(context.pool(), &mod_hide_community_form).await?;
build_community_response(context, local_user_view, community_id).await
}

17
crates/api/src/community/transfer.rs
View File

@ -33,7 +33,7 @@ impl Perform for TransferCommunity {
// Fetch the community mods
let community_id = data.community_id;
let mut community_mods =
CommunityModeratorView::for_community(context.conn().await?, community_id).await?;
CommunityModeratorView::for_community(context.pool(), community_id).await?;
// Make sure transferrer is either the top community mod, or an admin
if !(is_top_mod(&local_user_view, &community_mods).is_ok()
@ -54,7 +54,7 @@ impl Perform for TransferCommunity {
// Delete all the mods
let community_id = data.community_id;
CommunityModerator::delete_for_community(context.conn().await?, community_id).await?;
CommunityModerator::delete_for_community(context.pool(), community_id).await?;
// TODO: this should probably be a bulk operation
// Re-add the mods, in the new order
@ -64,7 +64,7 @@ impl Perform for TransferCommunity {
person_id: cmod.moderator.id,
};
CommunityModerator::join(context.conn().await?, &community_moderator_form)
CommunityModerator::join(context.pool(), &community_moderator_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
}
@ -76,17 +76,16 @@ impl Perform for TransferCommunity {
community_id: data.community_id,
};
ModTransferCommunity::create(context.conn().await?, &form).await?;
ModTransferCommunity::create(context.pool(), &form).await?;
let community_id = data.community_id;
let person_id = local_user_view.person.id;
let community_view =
CommunityView::read(context.conn().await?, community_id, Some(person_id), None)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?;
let community_view = CommunityView::read(context.pool(), community_id, Some(person_id), None)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?;
let community_id = data.community_id;
let moderators = CommunityModeratorView::for_community(context.conn().await?, community_id)
let moderators = CommunityModeratorView::for_community(context.pool(), community_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?;

20
crates/api/src/lib.rs
View File

@ -86,7 +86,7 @@ mod tests {
secret::Secret,
},
traits::Crud,
utils::build_db_conn_for_tests,
utils::build_db_pool_for_tests,
};
use lemmy_utils::{claims::Claims, settings::SETTINGS};
use serial_test::serial;
@ -94,11 +94,11 @@ mod tests {
#[tokio::test]
#[serial]
async fn test_should_not_validate_user_token_after_password_change() {
let mut conn = build_db_conn_for_tests().await;
let secret = Secret::init(conn).await.unwrap();
let pool = &build_db_pool_for_tests().await;
let secret = Secret::init(pool).await.unwrap();
let settings = &SETTINGS.to_owned();
let inserted_instance = Instance::read_or_create(conn, "my_domain.tld".to_string())
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
.await
.unwrap();
@ -108,16 +108,14 @@ mod tests {
.instance_id(inserted_instance.id)
.build();
let inserted_person = Person::create(conn, &new_person).await.unwrap();
let inserted_person = Person::create(pool, &new_person).await.unwrap();
let local_user_form = LocalUserInsertForm::builder()
.person_id(inserted_person.id)
.password_encrypted("123456".to_string())
.build();
let inserted_local_user = LocalUser::create(conn, &local_user_form)
.await
.unwrap();
let inserted_local_user = LocalUser::create(pool, &local_user_form).await.unwrap();
let jwt = Claims::jwt(
inserted_local_user.id.0,
@ -131,15 +129,13 @@ mod tests {
// The check should fail, since the validator time is now newer than the jwt issue time
let updated_local_user =
LocalUser::update_password(conn, inserted_local_user.id, "password111")
LocalUser::update_password(pool, inserted_local_user.id, "password111")
.await
.unwrap();
let check_after = check_validator_time(&updated_local_user.validator_time, &claims);
assert!(check_after.is_err());
let num_deleted = Person::delete(conn, inserted_person.id)
.await
.unwrap();
let num_deleted = Person::delete(pool, inserted_person.id).await.unwrap();
assert_eq!(1, num_deleted);
}
}

6
crates/api/src/local_user/add_admin.rs
View File

@ -30,7 +30,7 @@ impl Perform for AddAdmin {
let added = data.added;
let added_person_id = data.person_id;
let added_admin = Person::update(
context.conn().await?,
context.pool(),
added_person_id,
&PersonUpdateForm::builder().admin(Some(added)).build(),
)
@ -44,9 +44,9 @@ impl Perform for AddAdmin {
removed: Some(!data.added),
};
ModAdd::create(context.conn().await?, &form).await?;
ModAdd::create(context.pool(), &form).await?;
let admins = PersonView::admins(context.conn().await?).await?;
let admins = PersonView::admins(context.pool()).await?;
Ok(AddAdminResponse { admins })
}

6
crates/api/src/local_user/ban_person.rs
View File

@ -37,7 +37,7 @@ impl Perform for BanPerson {
let expires = data.expires.map(naive_from_unix);
let person = Person::update(
context.conn().await?,
context.pool(),
banned_person_id,
&PersonUpdateForm::builder()
.banned(Some(ban))
@ -68,10 +68,10 @@ impl Perform for BanPerson {
expires,
};
ModBan::create(context.conn().await?, &form).await?;
ModBan::create(context.pool(), &form).await?;
let person_id = data.person_id;
let person_view = PersonView::read(context.conn().await?, person_id).await?;
let person_view = PersonView::read(context.pool(), person_id).await?;
Ok(BanPersonResponse {
person_view,

6
crates/api/src/local_user/block.rs
View File

@ -34,18 +34,18 @@ impl Perform for BlockPerson {
target_id,
};
let target_person_view = PersonView::read(context.conn().await?, target_id).await?;
let target_person_view = PersonView::read(context.pool(), target_id).await?;
if target_person_view.person.admin {
return Err(LemmyError::from_message("cant_block_admin"));
}
if data.block {
PersonBlock::block(context.conn().await?, &person_block_form)
PersonBlock::block(context.pool(), &person_block_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "person_block_already_exists"))?;
} else {
PersonBlock::unblock(context.conn().await?, &person_block_form)
PersonBlock::unblock(context.pool(), &person_block_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "person_block_already_exists"))?;
}

2
crates/api/src/local_user/change_password.rs
View File

@ -38,7 +38,7 @@ impl Perform for ChangePassword {
let local_user_id = local_user_view.local_user.id;
let new_password = data.new_password.clone();
let updated_local_user =
LocalUser::update_password(context.conn().await?, local_user_id, &new_password).await?;
LocalUser::update_password(context.pool(), local_user_id, &new_password).await?;
// Return the jwt
Ok(LoginResponse {

11
crates/api/src/local_user/change_password_after_reset.rs
View File

@ -22,7 +22,7 @@ impl Perform for PasswordChangeAfterReset {
// Fetch the user_id from the token
let token = data.token.clone();
let local_user_id = PasswordResetRequest::read_from_token(context.conn().await?, &token)
let local_user_id = PasswordResetRequest::read_from_token(context.pool(), &token)
.await
.map(|p| p.local_user_id)?;
@ -35,13 +35,12 @@ impl Perform for PasswordChangeAfterReset {
// Update the user with the new password
let password = data.password.clone();
let updated_local_user =
LocalUser::update_password(context.conn().await?, local_user_id, &password)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_user"))?;
let updated_local_user = LocalUser::update_password(context.pool(), local_user_id, &password)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_user"))?;
// Return the jwt if login is allowed
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let jwt = if site_view.local_site.registration_mode == RegistrationMode::RequireApplication
&& !updated_local_user.accepted_application
{

4
crates/api/src/local_user/get_captcha.rs
View File

@ -17,7 +17,7 @@ impl Perform for GetCaptcha {
#[tracing::instrument(skip(context))]
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
if !local_site.captcha_enabled {
return Ok(GetCaptchaResponse { ok: None });
@ -37,7 +37,7 @@ impl Perform for GetCaptcha {
let captcha_form: CaptchaAnswerForm = CaptchaAnswerForm { answer };
// Stores the captcha item in the db
let captcha = CaptchaAnswer::insert(context.conn().await?, &captcha_form).await?;
let captcha = CaptchaAnswer::insert(context.pool(), &captcha_form).await?;
Ok(GetCaptchaResponse {
ok: Some(CaptchaResponse {

2
crates/api/src/local_user/list_banned.rs
View File

@ -19,7 +19,7 @@ impl Perform for GetBannedPersons {
// Make sure user is an admin
is_admin(&local_user_view)?;
let banned = PersonView::banned(context.conn().await?).await?;
let banned = PersonView::banned(context.pool()).await?;
Ok(Self::Response { banned })
}

16
crates/api/src/local_user/login.rs
View File

@ -17,14 +17,13 @@ impl Perform for Login {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<LoginResponse, LemmyError> {
let data: &Login = self;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
// Fetch that username / email
let username_or_email = data.username_or_email.clone();
let local_user_view =
LocalUserView::find_by_email_or_name(context.conn().await?, &username_or_email)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_that_username_or_email"))?;
let local_user_view = LocalUserView::find_by_email_or_name(context.pool(), &username_or_email)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_that_username_or_email"))?;
// Verify the password
let valid: bool = verify(
@ -50,12 +49,7 @@ impl Perform for Login {
return Err(LemmyError::from_message("email_not_verified"));
}
check_registration_application(
&local_user_view,
&site_view.local_site,
context.conn().await?,
)
.await?;
check_registration_application(&local_user_view, &site_view.local_site, context.pool()).await?;
// Check the totp
check_totp_2fa_valid(

2
crates/api/src/local_user/notifications/list_mentions.rs
View File

@ -28,7 +28,7 @@ impl Perform for GetPersonMentions {
let show_bot_accounts = Some(local_user_view.local_user.show_bot_accounts);
let mentions = PersonMentionQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.recipient_id(person_id)
.my_person_id(person_id)
.sort(sort)

2
crates/api/src/local_user/notifications/list_replies.rs
View File

@ -25,7 +25,7 @@ impl Perform for GetReplies {
let show_bot_accounts = Some(local_user_view.local_user.show_bot_accounts);
let replies = CommentReplyQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.recipient_id(person_id)
.my_person_id(person_id)
.sort(sort)

6
crates/api/src/local_user/notifications/mark_all_read.rs
View File

@ -23,17 +23,17 @@ impl Perform for MarkAllAsRead {
let person_id = local_user_view.person.id;
// Mark all comment_replies as read
CommentReply::mark_all_as_read(context.conn().await?, person_id)
CommentReply::mark_all_as_read(context.pool(), person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
// Mark all user mentions as read
PersonMention::mark_all_as_read(context.conn().await?, person_id)
PersonMention::mark_all_as_read(context.pool(), person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
// Mark all private_messages as read
PrivateMessage::mark_all_as_read(context.conn().await?, person_id)
PrivateMessage::mark_all_as_read(context.pool(), person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;

6
crates/api/src/local_user/notifications/mark_mention_read.rs
View File

@ -25,7 +25,7 @@ impl Perform for MarkPersonMentionAsRead {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let person_mention_id = data.person_mention_id;
let read_person_mention = PersonMention::read(context.conn().await?, person_mention_id).await?;
let read_person_mention = PersonMention::read(context.pool(), person_mention_id).await?;
if local_user_view.person.id != read_person_mention.recipient_id {
return Err(LemmyError::from_message("couldnt_update_comment"));
@ -34,7 +34,7 @@ impl Perform for MarkPersonMentionAsRead {
let person_mention_id = read_person_mention.id;
let read = Some(data.read);
PersonMention::update(
context.conn().await?,
context.pool(),
person_mention_id,
&PersonMentionUpdateForm { read },
)
@ -44,7 +44,7 @@ impl Perform for MarkPersonMentionAsRead {
let person_mention_id = read_person_mention.id;
let person_id = local_user_view.person.id;
let person_mention_view =
PersonMentionView::read(context.conn().await?, person_mention_id, Some(person_id)).await?;
PersonMentionView::read(context.pool(), person_mention_id, Some(person_id)).await?;
Ok(PersonMentionResponse {
person_mention_view,

6
crates/api/src/local_user/notifications/mark_reply_read.rs
View File

@ -25,7 +25,7 @@ impl Perform for MarkCommentReplyAsRead {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let comment_reply_id = data.comment_reply_id;
let read_comment_reply = CommentReply::read(context.conn().await?, comment_reply_id).await?;
let read_comment_reply = CommentReply::read(context.pool(), comment_reply_id).await?;
if local_user_view.person.id != read_comment_reply.recipient_id {
return Err(LemmyError::from_message("couldnt_update_comment"));
@ -35,7 +35,7 @@ impl Perform for MarkCommentReplyAsRead {
let read = Some(data.read);
CommentReply::update(
context.conn().await?,
context.pool(),
comment_reply_id,
&CommentReplyUpdateForm { read },
)
@ -45,7 +45,7 @@ impl Perform for MarkCommentReplyAsRead {
let comment_reply_id = read_comment_reply.id;
let person_id = local_user_view.person.id;
let comment_reply_view =
CommentReplyView::read(context.conn().await?, comment_reply_id, Some(person_id)).await?;
CommentReplyView::read(context.pool(), comment_reply_id, Some(person_id)).await?;
Ok(CommentReplyResponse { comment_reply_view })
}

6
crates/api/src/local_user/notifications/unread_count.rs
View File

@ -20,12 +20,12 @@ impl Perform for GetUnreadCount {
let person_id = local_user_view.person.id;
let replies = CommentReplyView::get_unread_replies(context.conn().await?, person_id).await?;
let replies = CommentReplyView::get_unread_replies(context.pool(), person_id).await?;
let mentions = PersonMentionView::get_unread_mentions(context.conn().await?, person_id).await?;
let mentions = PersonMentionView::get_unread_mentions(context.pool(), person_id).await?;
let private_messages =
PrivateMessageView::get_unread_messages(context.conn().await?, person_id).await?;
PrivateMessageView::get_unread_messages(context.pool(), person_id).await?;
Ok(Self::Response {
replies,

8
crates/api/src/local_user/report_count.rs
View File

@ -25,15 +25,13 @@ impl Perform for GetReportCount {
let community_id = data.community_id;
let comment_reports =
CommentReportView::get_report_count(context.conn().await?, person_id, admin, community_id)
.await?;
CommentReportView::get_report_count(context.pool(), person_id, admin, community_id).await?;
let post_reports =
PostReportView::get_report_count(context.conn().await?, person_id, admin, community_id)
.await?;
PostReportView::get_report_count(context.pool(), person_id, admin, community_id).await?;
let private_message_reports = if admin && community_id.is_none() {
Some(PrivateMessageReportView::get_report_count(context.conn().await?).await?)
Some(PrivateMessageReportView::get_report_count(context.pool()).await?)
} else {
None
};

6
crates/api/src/local_user/reset_password.rs
View File

@ -22,13 +22,13 @@ impl Perform for PasswordReset {
// Fetch that email
let email = data.email.to_lowercase();
let local_user_view = LocalUserView::find_by_email(context.conn().await?, &email)
let local_user_view = LocalUserView::find_by_email(context.pool(), &email)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_that_username_or_email"))?;
// Check for too many attempts (to limit potential abuse)
let recent_resets_count = PasswordResetRequest::get_recent_password_resets_count(
context.conn().await?,
context.pool(),
local_user_view.local_user.id,
)
.await?;
@ -37,7 +37,7 @@ impl Perform for PasswordReset {
}
// Email the pure token to the user.
send_password_reset_email(&local_user_view, context.conn().await?, context.settings()).await?;
send_password_reset_email(&local_user_view, context.pool(), context.settings()).await?;
Ok(PasswordResetResponse {})
}
}

18
crates/api/src/local_user/save_settings.rs
View File

@ -35,7 +35,7 @@ impl Perform for SaveUserSettings {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<LoginResponse, LemmyError> {
let data: &SaveUserSettings = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let avatar = diesel_option_overwrite_to_url(&data.avatar)?;
let banner = diesel_option_overwrite_to_url(&data.banner)?;
@ -49,13 +49,8 @@ impl Perform for SaveUserSettings {
let previous_email = local_user_view.local_user.email.clone().unwrap_or_default();
// Only send the verification email if there was an email change
if previous_email.ne(email) {
send_verification_email(
&local_user_view,
email,
context.conn().await?,
context.settings(),
)
.await?;
send_verification_email(&local_user_view, email, context.pool(), context.settings())
.await?;
}
}
@ -95,12 +90,12 @@ impl Perform for SaveUserSettings {
.banner(banner)
.build();
Person::update(context.conn().await?, person_id, &person_form)
Person::update(context.pool(), person_id, &person_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "user_already_exists"))?;
if let Some(discussion_languages) = data.discussion_languages.clone() {
LocalUserLanguage::update(context.conn().await?, discussion_languages, local_user_id).await?;
LocalUserLanguage::update(context.pool(), discussion_languages, local_user_id).await?;
}
// If generate_totp is Some(false), this will clear it out from the database.
@ -135,8 +130,7 @@ impl Perform for SaveUserSettings {
.open_links_in_new_tab(data.open_links_in_new_tab)
.build();
let local_user_res =
LocalUser::update(context.conn().await?, local_user_id, &local_user_form).await;
let local_user_res = LocalUser::update(context.pool(), local_user_id, &local_user_form).await;
let updated_local_user = match local_user_res {
Ok(u) => u,
Err(e) => {

7
crates/api/src/local_user/verify_email.rs
View File

@ -19,7 +19,7 @@ impl Perform for VerifyEmail {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
let token = self.token.clone();
let verification = EmailVerification::read_for_token(context.conn().await?, &token)
let verification = EmailVerification::read_for_token(context.pool(), &token)
.await
.map_err(|e| LemmyError::from_error_message(e, "token_not_found"))?;
@ -31,10 +31,9 @@ impl Perform for VerifyEmail {
.build();
let local_user_id = verification.local_user_id;
LocalUser::update(context.conn().await?, local_user_id, &form).await?;
LocalUser::update(context.pool(), local_user_id, &form).await?;
EmailVerification::delete_old_tokens_for_local_user(context.conn().await?, local_user_id)
.await?;
EmailVerification::delete_old_tokens_for_local_user(context.pool(), local_user_id).await?;
Ok(VerifyEmailResponse {})
}

12
crates/api/src/post/feature.rs
View File

@ -32,20 +32,20 @@ impl Perform for FeaturePost {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let post_id = data.post_id;
let orig_post = Post::read(context.conn().await?, post_id).await?;
let orig_post = Post::read(context.pool(), post_id).await?;
check_community_ban(
local_user_view.person.id,
orig_post.community_id,
context.conn().await?,
context.pool(),
)
.await?;
check_community_deleted_or_removed(orig_post.community_id, context.conn().await?).await?;
check_community_deleted_or_removed(orig_post.community_id, context.pool()).await?;
if data.feature_type == PostFeatureType::Community {
// Verify that only the mods can feature in community
is_mod_or_admin(
context.conn().await?,
context.pool(),
local_user_view.person.id,
orig_post.community_id,
)
@ -65,7 +65,7 @@ impl Perform for FeaturePost {
.featured_local(Some(data.featured))
.build()
};
Post::update(context.conn().await?, post_id, &new_post).await?;
Post::update(context.pool(), post_id, &new_post).await?;
// Mod tables
let form = ModFeaturePostForm {
@ -75,7 +75,7 @@ impl Perform for FeaturePost {
is_featured_community: data.feature_type == PostFeatureType::Community,
};
ModFeaturePost::create(context.conn().await?, &form).await?;
ModFeaturePost::create(context.pool(), &form).await?;
build_post_response(
context,

19
crates/api/src/post/like.rs
View File

@ -29,22 +29,17 @@ impl Perform for CreatePostLike {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<PostResponse, LemmyError> {
let data: &CreatePostLike = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
// Don't do a downvote if site has downvotes disabled
check_downvotes_enabled(data.score, &local_site)?;
// Check for a community ban
let post_id = data.post_id;
let post = Post::read(context.conn().await?, post_id).await?;
let post = Post::read(context.pool(), post_id).await?;
check_community_ban(
local_user_view.person.id,
post.community_id,
context.conn().await?,
)
.await?;
check_community_deleted_or_removed(post.community_id, context.conn().await?).await?;
check_community_ban(local_user_view.person.id, post.community_id, context.pool()).await?;
check_community_deleted_or_removed(post.community_id, context.pool()).await?;
let like_form = PostLikeForm {
post_id: data.post_id,
@ -55,18 +50,18 @@ impl Perform for CreatePostLike {
// Remove any likes first
let person_id = local_user_view.person.id;
PostLike::remove(context.conn().await?, person_id, post_id).await?;
PostLike::remove(context.pool(), person_id, post_id).await?;
// Only add the like if the score isnt 0
let do_add = like_form.score != 0 && (like_form.score == 1 || like_form.score == -1);
if do_add {
PostLike::like(context.conn().await?, &like_form)
PostLike::like(context.pool(), &like_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_like_post"))?;
}
// Mark the post as read
mark_post_as_read(person_id, post_id, context.conn().await?).await?;
mark_post_as_read(person_id, post_id, context.pool()).await?;
build_post_response(
context,

12
crates/api/src/post/lock.rs
View File

@ -30,19 +30,19 @@ impl Perform for LockPost {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let post_id = data.post_id;
let orig_post = Post::read(context.conn().await?, post_id).await?;
let orig_post = Post::read(context.pool(), post_id).await?;
check_community_ban(
local_user_view.person.id,
orig_post.community_id,
context.conn().await?,
context.pool(),
)
.await?;
check_community_deleted_or_removed(orig_post.community_id, context.conn().await?).await?;
check_community_deleted_or_removed(orig_post.community_id, context.pool()).await?;
// Verify that only the mods can lock
is_mod_or_admin(
context.conn().await?,
context.pool(),
local_user_view.person.id,
orig_post.community_id,
)
@ -52,7 +52,7 @@ impl Perform for LockPost {
let post_id = data.post_id;
let locked = data.locked;
Post::update(
context.conn().await?,
context.pool(),
post_id,
&PostUpdateForm::builder().locked(Some(locked)).build(),
)
@ -64,7 +64,7 @@ impl Perform for LockPost {
post_id: data.post_id,
locked: Some(locked),
};
ModLockPost::create(context.conn().await?, &form).await?;
ModLockPost::create(context.pool(), &form).await?;
build_post_response(
context,

6
crates/api/src/post/mark_read.rs
View File

@ -22,13 +22,13 @@ impl Perform for MarkPostAsRead {
// Mark the post as read / unread
if data.read {
mark_post_as_read(person_id, post_id, context.conn().await?).await?;
mark_post_as_read(person_id, post_id, context.pool()).await?;
} else {
mark_post_as_unread(person_id, post_id, context.conn().await?).await?;
mark_post_as_unread(person_id, post_id, context.pool()).await?;
}
// Fetch it
let post_view = PostView::read(context.conn().await?, post_id, Some(person_id), None).await?;
let post_view = PostView::read(context.pool(), post_id, Some(person_id), None).await?;
Ok(Self::Response { post_view })
}

8
crates/api/src/post/save.rs
View File

@ -27,21 +27,21 @@ impl Perform for SavePost {
};
if data.save {
PostSaved::save(context.conn().await?, &post_saved_form)
PostSaved::save(context.pool(), &post_saved_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_save_post"))?;
} else {
PostSaved::unsave(context.conn().await?, &post_saved_form)
PostSaved::unsave(context.pool(), &post_saved_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_save_post"))?;
}
let post_id = data.post_id;
let person_id = local_user_view.person.id;
let post_view = PostView::read(context.conn().await?, post_id, Some(person_id), None).await?;
let post_view = PostView::read(context.pool(), post_id, Some(person_id), None).await?;
// Mark the post as read
mark_post_as_read(person_id, post_id, context.conn().await?).await?;
mark_post_as_read(person_id, post_id, context.pool()).await?;
Ok(PostResponse { post_view })
}

13
crates/api/src/post_report/create.rs
View File

@ -24,16 +24,16 @@ impl Perform for CreatePostReport {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<PostReportResponse, LemmyError> {
let data: &CreatePostReport = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let reason = self.reason.trim();
check_report_reason(reason, &local_site)?;
let person_id = local_user_view.person.id;
let post_id = data.post_id;
let post_view = PostView::read(context.conn().await?, post_id, None, None).await?;
let post_view = PostView::read(context.pool(), post_id, None, None).await?;
check_community_ban(person_id, post_view.community.id, context.conn().await?).await?;
check_community_ban(person_id, post_view.community.id, context.pool()).await?;
let report_form = PostReportForm {
creator_id: person_id,
@ -44,19 +44,18 @@ impl Perform for CreatePostReport {
reason: reason.to_owned(),
};
let report = PostReport::report(context.conn().await?, &report_form)
let report = PostReport::report(context.pool(), &report_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
let post_report_view =
PostReportView::read(context.conn().await?, report.id, person_id).await?;
let post_report_view = PostReportView::read(context.pool(), report.id, person_id).await?;
// Email the admins
if local_site.reports_email_admins {
send_new_report_email_to_admins(
&post_report_view.creator.name,
&post_report_view.post_creator.name,
context.conn().await?,
context.pool(),
context.settings(),
)
.await?;

2
crates/api/src/post_report/list.rs
View File

@ -30,7 +30,7 @@ impl Perform for ListPostReports {
let page = data.page;
let limit = data.limit;
let post_reports = PostReportQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.my_person_id(person_id)
.admin(admin)
.community_id(community_id)

11
crates/api/src/post_report/resolve.rs
View File

@ -21,23 +21,22 @@ impl Perform for ResolvePostReport {
let report_id = data.report_id;
let person_id = local_user_view.person.id;
let report = PostReportView::read(context.conn().await?, report_id, person_id).await?;
let report = PostReportView::read(context.pool(), report_id, person_id).await?;
let person_id = local_user_view.person.id;
is_mod_or_admin(context.conn().await?, person_id, report.community.id).await?;
is_mod_or_admin(context.pool(), person_id, report.community.id).await?;
if data.resolved {
PostReport::resolve(context.conn().await?, report_id, person_id)
PostReport::resolve(context.pool(), report_id, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
} else {
PostReport::unresolve(context.conn().await?, report_id, person_id)
PostReport::unresolve(context.pool(), report_id, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
}
let post_report_view =
PostReportView::read(context.conn().await?, report_id, person_id).await?;
let post_report_view = PostReportView::read(context.pool(), report_id, person_id).await?;
Ok(PostReportResponse { post_report_view })
}

7
crates/api/src/private_message/mark_read.rs
View File

@ -26,8 +26,7 @@ impl Perform for MarkPrivateMessageAsRead {
// Checking permissions
let private_message_id = data.private_message_id;
let orig_private_message =
PrivateMessage::read(context.conn().await?, private_message_id).await?;
let orig_private_message = PrivateMessage::read(context.pool(), private_message_id).await?;
if local_user_view.person.id != orig_private_message.recipient_id {
return Err(LemmyError::from_message("couldnt_update_private_message"));
}
@ -36,14 +35,14 @@ impl Perform for MarkPrivateMessageAsRead {
let private_message_id = data.private_message_id;
let read = data.read;
PrivateMessage::update(
context.conn().await?,
context.pool(),
private_message_id,
&PrivateMessageUpdateForm::builder().read(Some(read)).build(),
)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
let view = PrivateMessageView::read(context.conn().await?, private_message_id).await?;
let view = PrivateMessageView::read(context.pool(), private_message_id).await?;
Ok(PrivateMessageResponse {
private_message_view: view,
})

10
crates/api/src/private_message_report/create.rs
View File

@ -23,14 +23,14 @@ impl Perform for CreatePrivateMessageReport {
#[tracing::instrument(skip(context))]
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
let local_user_view = local_user_view_from_jwt(&self.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let reason = self.reason.trim();
check_report_reason(reason, &local_site)?;
let person_id = local_user_view.person.id;
let private_message_id = self.private_message_id;
let private_message = PrivateMessage::read(context.conn().await?, private_message_id).await?;
let private_message = PrivateMessage::read(context.pool(), private_message_id).await?;
let report_form = PrivateMessageReportForm {
creator_id: person_id,
@ -39,19 +39,19 @@ impl Perform for CreatePrivateMessageReport {
reason: reason.to_owned(),
};
let report = PrivateMessageReport::report(context.conn().await?, &report_form)
let report = PrivateMessageReport::report(context.pool(), &report_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
let private_message_report_view =
PrivateMessageReportView::read(context.conn().await?, report.id).await?;
PrivateMessageReportView::read(context.pool(), report.id).await?;
// Email the admins
if local_site.reports_email_admins {
send_new_report_email_to_admins(
&private_message_report_view.creator.name,
&private_message_report_view.private_message_creator.name,
context.conn().await?,
context.pool(),
context.settings(),
)
.await?;

2
crates/api/src/private_message_report/list.rs
View File

@ -22,7 +22,7 @@ impl Perform for ListPrivateMessageReports {
let page = self.page;
let limit = self.limit;
let private_message_reports = PrivateMessageReportQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.unresolved_only(unresolved_only)
.page(page)
.limit(limit)

6
crates/api/src/private_message_report/resolve.rs
View File

@ -22,17 +22,17 @@ impl Perform for ResolvePrivateMessageReport {
let report_id = self.report_id;
let person_id = local_user_view.person.id;
if self.resolved {
PrivateMessageReport::resolve(context.conn().await?, report_id, person_id)
PrivateMessageReport::resolve(context.pool(), report_id, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
} else {
PrivateMessageReport::unresolve(context.conn().await?, report_id, person_id)
PrivateMessageReport::unresolve(context.pool(), report_id, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
}
let private_message_report_view =
PrivateMessageReportView::read(context.conn().await?, report_id).await?;
PrivateMessageReportView::read(context.pool(), report_id).await?;
Ok(PrivateMessageReportResponse {
private_message_report_view,

2
crates/api/src/site/federated_instances.rs
View File

@ -14,7 +14,7 @@ impl Perform for GetFederatedInstances {
#[tracing::instrument(skip(context))]
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let federated_instances =
build_federated_instances(&site_view.local_site, context.pool()).await?;

19
crates/api/src/site/leave_admin.rs
View File

@ -31,14 +31,14 @@ impl Perform for LeaveAdmin {
is_admin(&local_user_view)?;
// Make sure there isn't just one admin (so if one leaves, there will still be one left)
let admins = PersonView::admins(context.conn().await?).await?;
let admins = PersonView::admins(context.pool()).await?;
if admins.len() == 1 {
return Err(LemmyError::from_message("cannot_leave_admin"));
}
let person_id = local_user_view.person.id;
Person::update(
context.conn().await?,
context.pool(),
person_id,
&PersonUpdateForm::builder().admin(Some(false)).build(),
)
@ -51,17 +51,16 @@ impl Perform for LeaveAdmin {
removed: Some(true),
};
ModAdd::create(context.conn().await?, &form).await?;
ModAdd::create(context.pool(), &form).await?;
// Reread site and admins
let site_view = SiteView::read_local(context.conn().await?).await?;
let admins = PersonView::admins(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let admins = PersonView::admins(context.pool()).await?;
let all_languages = Language::read_all(context.conn().await?).await?;
let discussion_languages = SiteLanguage::read_local_raw(context.conn().await?).await?;
let taglines = Tagline::get_all(context.conn().await?, site_view.local_site.id).await?;
let custom_emojis =
CustomEmojiView::get_all(context.conn().await?, site_view.local_site.id).await?;
let all_languages = Language::read_all(context.pool()).await?;
let discussion_languages = SiteLanguage::read_local_raw(context.pool()).await?;
let taglines = Tagline::get_all(context.pool(), site_view.local_site.id).await?;
let custom_emojis = CustomEmojiView::get_all(context.pool(), site_view.local_site.id).await?;
Ok(GetSiteResponse {
site_view,

38
crates/api/src/site/mod_log.rs
View File

@ -40,7 +40,7 @@ impl Perform for GetModlog {
let data: &GetModlog = self;
let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), context).await;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
check_private_instance(&local_user_view, &local_site)?;
@ -56,7 +56,7 @@ impl Perform for GetModlog {
None => CommunityId(-1),
};
let is_mod_of_community = data.community_id.is_some()
&& is_mod_or_admin(context.conn().await?, local_person_id, community_id_value)
&& is_mod_or_admin(context.pool(), local_person_id, community_id_value)
.await
.is_ok();
let hide_modlog_names = local_site.hide_modlog_mod_names && !is_mod_of_community && !is_admin;
@ -76,47 +76,43 @@ impl Perform for GetModlog {
hide_modlog_names,
};
let removed_posts = match type_ {
All | ModRemovePost => ModRemovePostView::list(context.conn().await?, params).await?,
All | ModRemovePost => ModRemovePostView::list(context.pool(), params).await?,
_ => Default::default(),
};
let locked_posts = match type_ {
All | ModLockPost => ModLockPostView::list(context.conn().await?, params).await?,
All | ModLockPost => ModLockPostView::list(context.pool(), params).await?,
_ => Default::default(),
};
let featured_posts = match type_ {
All | ModFeaturePost => ModFeaturePostView::list(context.conn().await?, params).await?,
All | ModFeaturePost => ModFeaturePostView::list(context.pool(), params).await?,
_ => Default::default(),
};
let removed_comments = match type_ {
All | ModRemoveComment => ModRemoveCommentView::list(context.conn().await?, params).await?,
All | ModRemoveComment => ModRemoveCommentView::list(context.pool(), params).await?,
_ => Default::default(),
};
let banned_from_community = match type_ {
All | ModBanFromCommunity => {
ModBanFromCommunityView::list(context.conn().await?, params).await?
}
All | ModBanFromCommunity => ModBanFromCommunityView::list(context.pool(), params).await?,
_ => Default::default(),
};
let added_to_community = match type_ {
All | ModAddCommunity => ModAddCommunityView::list(context.conn().await?, params).await?,
All | ModAddCommunity => ModAddCommunityView::list(context.pool(), params).await?,
_ => Default::default(),
};
let transferred_to_community = match type_ {
All | ModTransferCommunity => {
ModTransferCommunityView::list(context.conn().await?, params).await?
}
All | ModTransferCommunity => ModTransferCommunityView::list(context.pool(), params).await?,
_ => Default::default(),
};
let hidden_communities = match type_ {
All | ModHideCommunity if other_person_id.is_none() => {
ModHideCommunityView::list(context.conn().await?, params).await?
ModHideCommunityView::list(context.pool(), params).await?
}
_ => Default::default(),
};
@ -133,40 +129,40 @@ impl Perform for GetModlog {
) = if data.community_id.is_none() {
(
match type_ {
All | ModBan => ModBanView::list(context.conn().await?, params).await?,
All | ModBan => ModBanView::list(context.pool(), params).await?,
_ => Default::default(),
},
match type_ {
All | ModAdd => ModAddView::list(context.conn().await?, params).await?,
All | ModAdd => ModAddView::list(context.pool(), params).await?,
_ => Default::default(),
},
match type_ {
All | ModRemoveCommunity if other_person_id.is_none() => {
ModRemoveCommunityView::list(context.conn().await?, params).await?
ModRemoveCommunityView::list(context.pool(), params).await?
}
_ => Default::default(),
},
match type_ {
All | AdminPurgePerson if other_person_id.is_none() => {
AdminPurgePersonView::list(context.conn().await?, params).await?
AdminPurgePersonView::list(context.pool(), params).await?
}
_ => Default::default(),
},
match type_ {
All | AdminPurgeCommunity if other_person_id.is_none() => {
AdminPurgeCommunityView::list(context.conn().await?, params).await?
AdminPurgeCommunityView::list(context.pool(), params).await?
}
_ => Default::default(),
},
match type_ {
All | AdminPurgePost if other_person_id.is_none() => {
AdminPurgePostView::list(context.conn().await?, params).await?
AdminPurgePostView::list(context.pool(), params).await?
}
_ => Default::default(),
},
match type_ {
All | AdminPurgeComment if other_person_id.is_none() => {
AdminPurgeCommentView::list(context.conn().await?, params).await?
AdminPurgeCommentView::list(context.pool(), params).await?
}
_ => Default::default(),
},

6
crates/api/src/site/purge/comment.rs
View File

@ -29,13 +29,13 @@ impl Perform for PurgeComment {
let comment_id = data.comment_id;
// Read the comment to get the post_id
let comment = Comment::read(context.conn().await?, comment_id).await?;
let comment = Comment::read(context.pool(), comment_id).await?;
let post_id = comment.post_id;
// TODO read comments for pictrs images and purge them
Comment::delete(context.conn().await?, comment_id).await?;
Comment::delete(context.pool(), comment_id).await?;
// Mod tables
let reason = data.reason.clone();
@ -45,7 +45,7 @@ impl Perform for PurgeComment {
post_id,
};
AdminPurgeComment::create(context.conn().await?, &form).await?;
AdminPurgeComment::create(context.pool(), &form).await?;
Ok(PurgeItemResponse { success: true })
}

6
crates/api/src/site/purge/community.rs
View File

@ -30,7 +30,7 @@ impl Perform for PurgeCommunity {
let community_id = data.community_id;
// Read the community to get its images
let community = Community::read(context.conn().await?, community_id).await?;
let community = Community::read(context.pool(), community_id).await?;
if let Some(banner) = community.banner {
purge_image_from_pictrs(context.client(), context.settings(), &banner)
@ -52,7 +52,7 @@ impl Perform for PurgeCommunity {
)
.await?;
Community::delete(context.conn().await?, community_id).await?;
Community::delete(context.pool(), community_id).await?;
// Mod tables
let reason = data.reason.clone();
@ -61,7 +61,7 @@ impl Perform for PurgeCommunity {
reason,
};
AdminPurgeCommunity::create(context.conn().await?, &form).await?;
AdminPurgeCommunity::create(context.pool(), &form).await?;
Ok(PurgeItemResponse { success: true })
}

6
crates/api/src/site/purge/person.rs
View File

@ -29,7 +29,7 @@ impl Perform for PurgePerson {
// Read the person to get their images
let person_id = data.person_id;
let person = Person::read(context.conn().await?, person_id).await?;
let person = Person::read(context.pool(), person_id).await?;
if let Some(banner) = person.banner {
purge_image_from_pictrs(context.client(), context.settings(), &banner)
@ -51,7 +51,7 @@ impl Perform for PurgePerson {
)
.await?;
Person::delete(context.conn().await?, person_id).await?;
Person::delete(context.pool(), person_id).await?;
// Mod tables
let reason = data.reason.clone();
@ -60,7 +60,7 @@ impl Perform for PurgePerson {
reason,
};
AdminPurgePerson::create(context.conn().await?, &form).await?;
AdminPurgePerson::create(context.pool(), &form).await?;
Ok(PurgeItemResponse { success: true })
}

6
crates/api/src/site/purge/post.rs
View File

@ -30,7 +30,7 @@ impl Perform for PurgePost {
let post_id = data.post_id;
// Read the post to get the community_id
let post = Post::read(context.conn().await?, post_id).await?;
let post = Post::read(context.pool(), post_id).await?;
// Purge image
if let Some(url) = post.url {
@ -47,7 +47,7 @@ impl Perform for PurgePost {
let community_id = post.community_id;
Post::delete(context.conn().await?, post_id).await?;
Post::delete(context.pool(), post_id).await?;
// Mod tables
let reason = data.reason.clone();
@ -57,7 +57,7 @@ impl Perform for PurgePost {
community_id,
};
AdminPurgePost::create(context.conn().await?, &form).await?;
AdminPurgePost::create(context.pool(), &form).await?;
Ok(PurgeItemResponse { success: true })
}

9
crates/api/src/site/registration_applications/approve.rs
View File

@ -37,7 +37,7 @@ impl Perform for ApproveRegistrationApplication {
};
let registration_application =
RegistrationApplication::update(context.conn().await?, app_id, &app_form).await?;
RegistrationApplication::update(context.pool(), app_id, &app_form).await?;
// Update the local_user row
let local_user_form = LocalUserUpdateForm::builder()
@ -45,11 +45,10 @@ impl Perform for ApproveRegistrationApplication {
.build();
let approved_user_id = registration_application.local_user_id;
LocalUser::update(context.conn().await?, approved_user_id, &local_user_form).await?;
LocalUser::update(context.pool(), approved_user_id, &local_user_form).await?;
if data.approve {
let approved_local_user_view =
LocalUserView::read(context.conn().await?, approved_user_id).await?;
let approved_local_user_view = LocalUserView::read(context.pool(), approved_user_id).await?;
if approved_local_user_view.local_user.email.is_some() {
send_application_approved_email(&approved_local_user_view, context.settings())?;
@ -58,7 +57,7 @@ impl Perform for ApproveRegistrationApplication {
// Read the view
let registration_application =
RegistrationApplicationView::read(context.conn().await?, app_id).await?;
RegistrationApplicationView::read(context.pool(), app_id).await?;
Ok(Self::Response {
registration_application,

4
crates/api/src/site/registration_applications/list.rs
View File

@ -17,7 +17,7 @@ impl Perform for ListRegistrationApplications {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
let data = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
// Make sure user is an admin
is_admin(&local_user_view)?;
@ -28,7 +28,7 @@ impl Perform for ListRegistrationApplications {
let page = data.page;
let limit = data.limit;
let registration_applications = RegistrationApplicationQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.unread_only(unread_only)
.verified_email_only(Some(verified_email_only))
.page(page)

5
crates/api/src/site/registration_applications/unread_count.rs
View File

@ -16,7 +16,7 @@ impl Perform for GetUnreadRegistrationApplicationCount {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
let data = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
// Only let admins do this
is_admin(&local_user_view)?;
@ -24,8 +24,7 @@ impl Perform for GetUnreadRegistrationApplicationCount {
let verified_email_only = local_site.require_email_verification;
let registration_applications =
RegistrationApplicationView::get_unread_count(context.conn().await?, verified_email_only)
.await?;
RegistrationApplicationView::get_unread_count(context.pool(), verified_email_only).await?;
Ok(Self::Response {
registration_applications,

38
crates/api_common/src/build_response.rs
View File

@ -30,7 +30,7 @@ pub async fn build_comment_response(
recipient_ids: Vec<LocalUserId>,
) -> Result<CommentResponse, LemmyError> {
let person_id = local_user_view.map(|l| l.person.id);
let comment_view = CommentView::read(context.conn().await?, comment_id, person_id).await?;
let comment_view = CommentView::read(context.pool(), comment_id, person_id).await?;
Ok(CommentResponse {
comment_view,
recipient_ids,
@ -43,22 +43,18 @@ pub async fn build_community_response(
local_user_view: LocalUserView,
community_id: CommunityId,
) -> Result<CommunityResponse, LemmyError> {
let is_mod_or_admin = is_mod_or_admin(
context.conn().await?,
local_user_view.person.id,
community_id,
)
.await
.is_ok();
let is_mod_or_admin = is_mod_or_admin(context.pool(), local_user_view.person.id, community_id)
.await
.is_ok();
let person_id = local_user_view.person.id;
let community_view = CommunityView::read(
context.conn().await?,
context.pool(),
community_id,
Some(person_id),
Some(is_mod_or_admin),
)
.await?;
let discussion_languages = CommunityLanguage::read(context.conn().await?, community_id).await?;
let discussion_languages = CommunityLanguage::read(context.pool(), community_id).await?;
Ok(CommunityResponse {
community_view,
@ -72,11 +68,11 @@ pub async fn build_post_response(
person_id: PersonId,
post_id: PostId,
) -> Result<PostResponse, LemmyError> {
let is_mod_or_admin = is_mod_or_admin(context.conn().await?, person_id, community_id)
let is_mod_or_admin = is_mod_or_admin(context.pool(), person_id, community_id)
.await
.is_ok();
let post_view = PostView::read(
context.conn().await?,
context.pool(),
post_id,
Some(person_id),
Some(is_mod_or_admin),
@ -104,7 +100,7 @@ pub async fn send_local_notifs(
.filter(|m| m.is_local(&context.settings().hostname) && m.name.ne(&person.name))
{
let mention_name = mention.name.clone();
let user_view = LocalUserView::read_from_name(context.conn().await?, &mention_name).await;
let user_view = LocalUserView::read_from_name(context.pool(), &mention_name).await;
if let Ok(mention_user_view) = user_view {
// TODO
// At some point, make it so you can't tag the parent creator either
@ -119,7 +115,7 @@ pub async fn send_local_notifs(
// Allow this to fail softly, since comment edits might re-update or replace it
// Let the uniqueness handle this fail
PersonMention::create(context.conn().await?, &user_mention_form)
PersonMention::create(context.pool(), &user_mention_form)
.await
.ok();
@ -138,19 +134,19 @@ pub async fn send_local_notifs(
// Send comment_reply to the parent commenter / poster
if let Some(parent_comment_id) = comment.parent_comment_id() {
let parent_comment = Comment::read(context.conn().await?, parent_comment_id).await?;
let parent_comment = Comment::read(context.pool(), parent_comment_id).await?;
// Get the parent commenter local_user
let parent_creator_id = parent_comment.creator_id;
// Only add to recipients if that person isn't blocked
let creator_blocked = check_person_block(person.id, parent_creator_id, context.conn().await?)
let creator_blocked = check_person_block(person.id, parent_creator_id, context.pool())
.await
.is_err();
// Don't send a notif to yourself
if parent_comment.creator_id != person.id && !creator_blocked {
let user_view = LocalUserView::read_person(context.conn().await?, parent_creator_id).await;
let user_view = LocalUserView::read_person(context.pool(), parent_creator_id).await;
if let Ok(parent_user_view) = user_view {
recipient_ids.push(parent_user_view.local_user.id);
@ -162,7 +158,7 @@ pub async fn send_local_notifs(
// Allow this to fail softly, since comment edits might re-update or replace it
// Let the uniqueness handle this fail
CommentReply::create(context.conn().await?, &comment_reply_form)
CommentReply::create(context.pool(), &comment_reply_form)
.await
.ok();
@ -180,13 +176,13 @@ pub async fn send_local_notifs(
} else {
// If there's no parent, its the post creator
// Only add to recipients if that person isn't blocked
let creator_blocked = check_person_block(person.id, post.creator_id, context.conn().await?)
let creator_blocked = check_person_block(person.id, post.creator_id, context.pool())
.await
.is_err();
if post.creator_id != person.id && !creator_blocked {
let creator_id = post.creator_id;
let parent_user = LocalUserView::read_person(context.conn().await?, creator_id).await;
let parent_user = LocalUserView::read_person(context.pool(), creator_id).await;
if let Ok(parent_user_view) = parent_user {
recipient_ids.push(parent_user_view.local_user.id);
@ -198,7 +194,7 @@ pub async fn send_local_notifs(
// Allow this to fail softly, since comment edits might re-update or replace it
// Let the uniqueness handle this fail
CommentReply::create(context.conn().await?, &comment_reply_form)
CommentReply::create(context.pool(), &comment_reply_form)
.await
.ok();

9
crates/api_common/src/context.rs
View File

@ -1,9 +1,5 @@
use lemmy_db_schema::{
source::secret::Secret,
utils::{get_conn, DbPool, DbPooledConn},
};
use lemmy_db_schema::{source::secret::Secret, utils::DbPool};
use lemmy_utils::{
error::LemmyResult,
rate_limit::RateLimitCell,
settings::{structs::Settings, SETTINGS},
};
@ -35,9 +31,6 @@ impl LemmyContext {
pub fn pool(&self) -> &DbPool {
&self.pool
}
pub async fn conn(&self) -> LemmyResult<DbPooledConn> {
Ok(get_conn(self.pool()).await?)
}
pub fn client(&self) -> &ClientWithMiddleware {
&self.client
}

120
crates/api_common/src/utils.rs
View File

@ -24,7 +24,7 @@ use lemmy_db_schema::{
registration_application::RegistrationApplication,
},
traits::{Crud, Readable},
utils::{get_conn, DbPool, GetConn},
utils::DbPool,
RegistrationMode,
};
use lemmy_db_views::{comment_view::CommentQuery, structs::LocalUserView};
@ -50,11 +50,11 @@ use url::{ParseError, Url};
#[tracing::instrument(skip_all)]
pub async fn is_mod_or_admin(
conn: impl GetConn,
pool: &DbPool,
person_id: PersonId,
community_id: CommunityId,
) -> Result<(), LemmyError> {
let is_mod_or_admin = CommunityView::is_mod_or_admin(conn, person_id, community_id).await?;
let is_mod_or_admin = CommunityView::is_mod_or_admin(pool, person_id, community_id).await?;
if !is_mod_or_admin {
return Err(LemmyError::from_message("not_a_mod_or_admin"));
}
@ -63,13 +63,13 @@ pub async fn is_mod_or_admin(
#[tracing::instrument(skip_all)]
pub async fn is_mod_or_admin_opt(
conn: impl GetConn,
pool: &DbPool,
local_user_view: Option<&LocalUserView>,
community_id: Option<CommunityId>,
) -> Result<(), LemmyError> {
if let Some(local_user_view) = local_user_view {
if let Some(community_id) = community_id {
is_mod_or_admin(conn, local_user_view.person.id, community_id).await
is_mod_or_admin(pool, local_user_view.person.id, community_id).await
} else {
is_admin(local_user_view)
}
@ -101,8 +101,8 @@ pub fn is_top_mod(
}
#[tracing::instrument(skip_all)]
pub async fn get_post(post_id: PostId, conn: impl GetConn) -> Result<Post, LemmyError> {
Post::read(conn, post_id)
pub async fn get_post(post_id: PostId, pool: &DbPool) -> Result<Post, LemmyError> {
Post::read(pool, post_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))
}
@ -111,11 +111,11 @@ pub async fn get_post(post_id: PostId, conn: impl GetConn) -> Result<Post, Lemmy
pub async fn mark_post_as_read(
person_id: PersonId,
post_id: PostId,
conn: impl GetConn,
pool: &DbPool,
) -> Result<PostRead, LemmyError> {
let post_read_form = PostReadForm { post_id, person_id };
PostRead::mark_as_read(conn, &post_read_form)
PostRead::mark_as_read(pool, &post_read_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_mark_post_as_read"))
}
@ -124,11 +124,11 @@ pub async fn mark_post_as_read(
pub async fn mark_post_as_unread(
person_id: PersonId,
post_id: PostId,
conn: impl GetConn,
pool: &DbPool,
) -> Result<usize, LemmyError> {
let post_read_form = PostReadForm { post_id, person_id };
PostRead::mark_as_unread(conn, &post_read_form)
PostRead::mark_as_unread(pool, &post_read_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_mark_post_as_read"))
}
@ -142,7 +142,7 @@ pub async fn local_user_view_from_jwt(
.map_err(|e| e.with_message("not_logged_in"))?
.claims;
let local_user_id = LocalUserId(claims.sub);
let local_user_view = LocalUserView::read(context.conn().await?, local_user_id).await?;
let local_user_view = LocalUserView::read(context.pool(), local_user_id).await?;
check_user_valid(
local_user_view.person.banned,
local_user_view.person.ban_expires,
@ -197,9 +197,9 @@ pub fn check_user_valid(
pub async fn check_community_ban(
person_id: PersonId,
community_id: CommunityId,
conn: impl GetConn,
pool: &DbPool,
) -> Result<(), LemmyError> {
let is_banned = CommunityPersonBanView::get(conn, person_id, community_id)
let is_banned = CommunityPersonBanView::get(pool, person_id, community_id)
.await
.is_ok();
if is_banned {
@ -212,9 +212,9 @@ pub async fn check_community_ban(
#[tracing::instrument(skip_all)]
pub async fn check_community_deleted_or_removed(
community_id: CommunityId,
conn: impl GetConn,
pool: &DbPool,
) -> Result<(), LemmyError> {
let community = Community::read(conn, community_id)
let community = Community::read(pool, community_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?;
if community.deleted || community.removed {
@ -236,9 +236,9 @@ pub fn check_post_deleted_or_removed(post: &Post) -> Result<(), LemmyError> {
pub async fn check_person_block(
my_id: PersonId,
potential_blocker_id: PersonId,
conn: impl GetConn,
pool: &DbPool,
) -> Result<(), LemmyError> {
let is_blocked = PersonBlock::read(conn, potential_blocker_id, my_id)
let is_blocked = PersonBlock::read(pool, potential_blocker_id, my_id)
.await
.is_ok();
if is_blocked {
@ -272,16 +272,12 @@ pub async fn build_federated_instances(
local_site: &LocalSite,
pool: &DbPool,
) -> Result<Option<FederatedInstances>, LemmyError> {
let conn_0 = &mut *get_conn(pool).await?;
let conn_1 = &mut *get_conn(pool).await?;
let conn_2 = &mut *get_conn(pool).await?;
if local_site.federation_enabled {
// TODO I hate that this requires 3 queries
let (linked, allowed, blocked) = try_join!(
Instance::linked(conn_0),
Instance::allowlist(conn_1),
Instance::blocklist(conn_2)
Instance::linked(pool),
Instance::allowlist(pool),
Instance::blocklist(pool)
)?;
Ok(Some(FederatedInstances {
@ -338,7 +334,7 @@ pub fn send_email_to_user(
pub async fn send_password_reset_email(
user: &LocalUserView,
conn: impl GetConn,
pool: &DbPool,
settings: &Settings,
) -> Result<(), LemmyError> {
// Generate a random token
@ -347,7 +343,7 @@ pub async fn send_password_reset_email(
// Insert the row
let token2 = token.clone();
let local_user_id = user.local_user.id;
PasswordResetRequest::create_token(conn, local_user_id, &token2).await?;
PasswordResetRequest::create_token(pool, local_user_id, &token2).await?;
let email = &user.local_user.email.clone().expect("email");
let lang = get_interface_language(user);
@ -362,7 +358,7 @@ pub async fn send_password_reset_email(
pub async fn send_verification_email(
user: &LocalUserView,
new_email: &str,
conn: impl GetConn,
pool: &DbPool,
settings: &Settings,
) -> Result<(), LemmyError> {
let form = EmailVerificationForm {
@ -375,7 +371,7 @@ pub async fn send_verification_email(
settings.get_protocol_and_hostname(),
&form.verification_token
);
EmailVerification::create(conn, &form).await?;
EmailVerification::create(pool, &form).await?;
let lang = get_interface_language(user);
let subject = lang.verify_email_subject(&settings.hostname);
@ -453,11 +449,11 @@ pub fn send_application_approved_email(
/// Send a new applicant email notification to all admins
pub async fn send_new_applicant_email_to_admins(
applicant_username: &str,
conn: impl GetConn,
pool: &DbPool,
settings: &Settings,
) -> Result<(), LemmyError> {
// Collect the admins with emails
let admins = LocalUserView::list_admins_with_emails(conn).await?;
let admins = LocalUserView::list_admins_with_emails(pool).await?;
let applications_link = &format!(
"{}/registration_applications",
@ -478,11 +474,11 @@ pub async fn send_new_applicant_email_to_admins(
pub async fn send_new_report_email_to_admins(
reporter_username: &str,
reported_username: &str,
conn: impl GetConn,
pool: &DbPool,
settings: &Settings,
) -> Result<(), LemmyError> {
// Collect the admins with emails
let admins = LocalUserView::list_admins_with_emails(conn).await?;
let admins = LocalUserView::list_admins_with_emails(pool).await?;
let reports_link = &format!("{}/reports", settings.get_protocol_and_hostname(),);
@ -499,7 +495,7 @@ pub async fn send_new_report_email_to_admins(
pub async fn check_registration_application(
local_user_view: &LocalUserView,
local_site: &LocalSite,
conn: impl GetConn,
pool: &DbPool,
) -> Result<(), LemmyError> {
if (local_site.registration_mode == RegistrationMode::RequireApplication
|| local_site.registration_mode == RegistrationMode::Closed)
@ -508,7 +504,7 @@ pub async fn check_registration_application(
{
// Fetch the registration, see if its denied
let local_user_id = local_user_view.local_user.id;
let registration = RegistrationApplication::find_by_local_user_id(conn, local_user_id).await?;
let registration = RegistrationApplication::find_by_local_user_id(pool, local_user_id).await?;
if let Some(deny_reason) = registration.deny_reason {
let lang = get_interface_language(local_user_view);
let registration_denied_message = format!("{}: {}", lang.registration_denied(), &deny_reason);
@ -537,7 +533,7 @@ pub async fn purge_image_posts_for_person(
settings: &Settings,
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
let posts = Post::fetch_pictrs_posts_for_creator(get_conn(pool).await?, banned_person_id).await?;
let posts = Post::fetch_pictrs_posts_for_creator(pool, banned_person_id).await?;
for post in posts {
if let Some(url) = post.url {
purge_image_from_pictrs(client, settings, &url).await.ok();
@ -549,11 +545,7 @@ pub async fn purge_image_posts_for_person(
}
}
Post::remove_pictrs_post_images_and_thumbnails_for_creator(
get_conn(pool).await?,
banned_person_id,
)
.await?;
Post::remove_pictrs_post_images_and_thumbnails_for_creator(pool, banned_person_id).await?;
Ok(())
}
@ -564,8 +556,7 @@ pub async fn purge_image_posts_for_community(
settings: &Settings,
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
let posts =
Post::fetch_pictrs_posts_for_community(get_conn(pool).await?, banned_community_id).await?;
let posts = Post::fetch_pictrs_posts_for_community(pool, banned_community_id).await?;
for post in posts {
if let Some(url) = post.url {
purge_image_from_pictrs(client, settings, &url).await.ok();
@ -577,11 +568,7 @@ pub async fn purge_image_posts_for_community(
}
}
Post::remove_pictrs_post_images_and_thumbnails_for_community(
get_conn(pool).await?,
banned_community_id,
)
.await?;
Post::remove_pictrs_post_images_and_thumbnails_for_community(pool, banned_community_id).await?;
Ok(())
}
@ -593,7 +580,7 @@ pub async fn remove_user_data(
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
// Purge user images
let person = Person::read(get_conn(pool).await?, banned_person_id).await?;
let person = Person::read(pool, banned_person_id).await?;
if let Some(avatar) = person.avatar {
purge_image_from_pictrs(client, settings, &avatar)
.await
@ -607,7 +594,7 @@ pub async fn remove_user_data(
// Update the fields to None
Person::update(
get_conn(pool).await?,
pool,
banned_person_id,
&PersonUpdateForm::builder()
.avatar(Some(None))
@ -617,7 +604,7 @@ pub async fn remove_user_data(
.await?;
// Posts
Post::update_removed_for_creator(get_conn(pool).await?, banned_person_id, None, true).await?;
Post::update_removed_for_creator(pool, banned_person_id, None, true).await?;
// Purge image posts
purge_image_posts_for_person(banned_person_id, pool, settings, client).await?;
@ -625,8 +612,7 @@ pub async fn remove_user_data(
// Communities
// Remove all communities where they're the top mod
// for now, remove the communities manually
let first_mod_communities =
CommunityModeratorView::get_community_first_mods(get_conn(pool).await?).await?;
let first_mod_communities = CommunityModeratorView::get_community_first_mods(pool).await?;
// Filter to only this banned users top communities
let banned_user_first_communities: Vec<CommunityModeratorView> = first_mod_communities
@ -637,7 +623,7 @@ pub async fn remove_user_data(
for first_mod_community in banned_user_first_communities {
let community_id = first_mod_community.community.id;
Community::update(
get_conn(pool).await?,
pool,
community_id,
&CommunityUpdateForm::builder().removed(Some(true)).build(),
)
@ -654,7 +640,7 @@ pub async fn remove_user_data(
}
// Update the fields to None
Community::update(
get_conn(pool).await?,
pool,
community_id,
&CommunityUpdateForm::builder()
.icon(Some(None))
@ -665,7 +651,7 @@ pub async fn remove_user_data(
}
// Comments
Comment::update_removed_for_creator(get_conn(pool).await?, banned_person_id, true).await?;
Comment::update_removed_for_creator(pool, banned_person_id, true).await?;
Ok(())
}
@ -676,18 +662,12 @@ pub async fn remove_user_data_in_community(
pool: &DbPool,
) -> Result<(), LemmyError> {
// Posts
Post::update_removed_for_creator(
get_conn(pool).await?,
banned_person_id,
Some(community_id),
true,
)
.await?;
Post::update_removed_for_creator(pool, banned_person_id, Some(community_id), true).await?;
// Comments
// TODO Diesel doesn't allow updates with joins, so this has to be a loop
let comments = CommentQuery::builder()
.conn(get_conn(pool).await?)
.pool(pool)
.creator_id(Some(banned_person_id))
.community_id(Some(community_id))
.build()
@ -697,7 +677,7 @@ pub async fn remove_user_data_in_community(
for comment_view in &comments {
let comment_id = comment_view.comment.id;
Comment::update(
get_conn(pool).await?,
pool,
comment_id,
&CommentUpdateForm::builder().removed(Some(true)).build(),
)
@ -714,7 +694,7 @@ pub async fn delete_user_account(
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
// Delete their images
let person = Person::read(get_conn(pool).await?, person_id).await?;
let person = Person::read(pool, person_id).await?;
if let Some(avatar) = person.avatar {
purge_image_from_pictrs(client, settings, &avatar)
.await
@ -728,12 +708,12 @@ pub async fn delete_user_account(
// No need to update avatar and banner, those are handled in Person::delete_account
// Comments
Comment::permadelete_for_creator(get_conn(pool).await?, person_id)
Comment::permadelete_for_creator(pool, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
// Posts
Post::permadelete_for_creator(get_conn(pool).await?, person_id)
Post::permadelete_for_creator(pool, person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_post"))?;
@ -741,9 +721,9 @@ pub async fn delete_user_account(
purge_image_posts_for_person(person_id, pool, settings, client).await?;
// Leave communities they mod
CommunityModerator::leave_all_communities(get_conn(pool).await?, person_id).await?;
CommunityModerator::leave_all_communities(pool, person_id).await?;
Person::delete_account(get_conn(pool).await?, person_id).await?;
Person::delete_account(pool, person_id).await?;
Ok(())
}

37
crates/api_crud/src/comment/create.rs
View File

@ -43,7 +43,7 @@ impl PerformCrud for CreateComment {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<CommentResponse, LemmyError> {
let data: &CreateComment = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let content_slurs_removed = remove_slurs(
&data.content.clone(),
@ -53,16 +53,11 @@ impl PerformCrud for CreateComment {
// Check for a community ban
let post_id = data.post_id;
let post = get_post(post_id, context.conn().await?).await?;
let post = get_post(post_id, context.pool()).await?;
let community_id = post.community_id;
check_community_ban(
local_user_view.person.id,
community_id,
context.conn().await?,
)
.await?;
check_community_deleted_or_removed(community_id, context.conn().await?).await?;
check_community_ban(local_user_view.person.id, community_id, context.pool()).await?;
check_community_deleted_or_removed(community_id, context.pool()).await?;
check_post_deleted_or_removed(&post)?;
// Check if post is locked, no new comments
@ -72,7 +67,7 @@ impl PerformCrud for CreateComment {
// Fetch the parent, if it exists
let parent_opt = if let Some(parent_id) = data.parent_id {
Comment::read(context.conn().await?, parent_id).await.ok()
Comment::read(context.pool(), parent_id).await.ok()
} else {
None
};
@ -94,7 +89,7 @@ impl PerformCrud for CreateComment {
let language_id = data.language_id.unwrap_or(parent_language);
CommunityLanguage::is_allowed_community_language(
context.conn().await?,
context.pool(),
Some(language_id),
community_id,
)
@ -109,10 +104,9 @@ impl PerformCrud for CreateComment {
// Create the comment
let parent_path = parent_opt.clone().map(|t| t.path);
let inserted_comment =
Comment::create(context.conn().await?, &comment_form, parent_path.as_ref())
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_comment"))?;
let inserted_comment = Comment::create(context.pool(), &comment_form, parent_path.as_ref())
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_comment"))?;
// Necessary to update the ap_id
let inserted_comment_id = inserted_comment.id;
@ -124,7 +118,7 @@ impl PerformCrud for CreateComment {
&protocol_and_hostname,
)?;
let updated_comment = Comment::update(
context.conn().await?,
context.pool(),
inserted_comment_id,
&CommentUpdateForm::builder().ap_id(Some(apub_id)).build(),
)
@ -151,17 +145,17 @@ impl PerformCrud for CreateComment {
score: 1,
};
CommentLike::like(context.conn().await?, &like_form)
CommentLike::like(context.pool(), &like_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_like_comment"))?;
// If its a reply, mark the parent as read
if let Some(parent) = parent_opt {
let parent_id = parent.id;
let comment_reply = CommentReply::read_by_comment(context.conn().await?, parent_id).await;
let comment_reply = CommentReply::read_by_comment(context.pool(), parent_id).await;
if let Ok(reply) = comment_reply {
CommentReply::update(
context.conn().await?,
context.pool(),
reply.id,
&CommentReplyUpdateForm { read: Some(true) },
)
@ -172,11 +166,10 @@ impl PerformCrud for CreateComment {
// If the parent has PersonMentions mark them as read too
let person_id = local_user_view.person.id;
let person_mention =
PersonMention::read_by_comment_and_person(context.conn().await?, parent_id, person_id)
.await;
PersonMention::read_by_comment_and_person(context.pool(), parent_id, person_id).await;
if let Ok(mention) = person_mention {
PersonMention::update(
context.conn().await?,
context.pool(),
mention.id,
&PersonMentionUpdateForm { read: Some(true) },
)

8
crates/api_crud/src/comment/delete.rs
View File

@ -26,7 +26,7 @@ impl PerformCrud for DeleteComment {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let comment_id = data.comment_id;
let orig_comment = CommentView::read(context.conn().await?, comment_id, None).await?;
let orig_comment = CommentView::read(context.pool(), comment_id, None).await?;
// Dont delete it if its already been deleted.
if orig_comment.comment.deleted == data.deleted {
@ -36,7 +36,7 @@ impl PerformCrud for DeleteComment {
check_community_ban(
local_user_view.person.id,
orig_comment.community.id,
context.conn().await?,
context.pool(),
)
.await?;
@ -48,7 +48,7 @@ impl PerformCrud for DeleteComment {
// Do the delete
let deleted = data.deleted;
let updated_comment = Comment::update(
context.conn().await?,
context.pool(),
comment_id,
&CommentUpdateForm::builder().deleted(Some(deleted)).build(),
)
@ -56,7 +56,7 @@ impl PerformCrud for DeleteComment {
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
let post_id = updated_comment.post_id;
let post = Post::read(context.conn().await?, post_id).await?;
let post = Post::read(context.pool(), post_id).await?;
let recipient_ids = send_local_notifs(
vec![],
&updated_comment,

2
crates/api_crud/src/comment/read.rs
View File

@ -17,7 +17,7 @@ impl PerformCrud for GetComment {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
let data = self;
let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), context).await;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
check_private_instance(&local_user_view, &local_site)?;

12
crates/api_crud/src/comment/remove.rs
View File

@ -27,18 +27,18 @@ impl PerformCrud for RemoveComment {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let comment_id = data.comment_id;
let orig_comment = CommentView::read(context.conn().await?, comment_id, None).await?;
let orig_comment = CommentView::read(context.pool(), comment_id, None).await?;
check_community_ban(
local_user_view.person.id,
orig_comment.community.id,
context.conn().await?,
context.pool(),
)
.await?;
// Verify that only a mod or admin can remove
is_mod_or_admin(
context.conn().await?,
context.pool(),
local_user_view.person.id,
orig_comment.community.id,
)
@ -47,7 +47,7 @@ impl PerformCrud for RemoveComment {
// Do the remove
let removed = data.removed;
let updated_comment = Comment::update(
context.conn().await?,
context.pool(),
comment_id,
&CommentUpdateForm::builder().removed(Some(removed)).build(),
)
@ -61,10 +61,10 @@ impl PerformCrud for RemoveComment {
removed: Some(removed),
reason: data.reason.clone(),
};
ModRemoveComment::create(context.conn().await?, &form).await?;
ModRemoveComment::create(context.pool(), &form).await?;
let post_id = updated_comment.post_id;
let post = Post::read(context.conn().await?, post_id).await?;
let post = Post::read(context.pool(), post_id).await?;
let recipient_ids = send_local_notifs(
vec![],
&updated_comment,

10
crates/api_crud/src/comment/update.rs
View File

@ -33,15 +33,15 @@ impl PerformCrud for EditComment {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<CommentResponse, LemmyError> {
let data: &EditComment = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let comment_id = data.comment_id;
let orig_comment = CommentView::read(context.conn().await?, comment_id, None).await?;
let orig_comment = CommentView::read(context.pool(), comment_id, None).await?;
check_community_ban(
local_user_view.person.id,
orig_comment.community.id,
context.conn().await?,
context.pool(),
)
.await?;
@ -52,7 +52,7 @@ impl PerformCrud for EditComment {
let language_id = self.language_id;
CommunityLanguage::is_allowed_community_language(
context.conn().await?,
context.pool(),
language_id,
orig_comment.community.id,
)
@ -72,7 +72,7 @@ impl PerformCrud for EditComment {
.language_id(data.language_id)
.updated(Some(Some(naive_now())))
.build();
let updated_comment = Comment::update(context.conn().await?, comment_id, &form)
let updated_comment = Comment::update(context.pool(), comment_id, &form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;

15
crates/api_crud/src/community/create.rs
View File

@ -48,7 +48,7 @@ impl PerformCrud for CreateCommunity {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<CommunityResponse, LemmyError> {
let data: &CreateCommunity = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let local_site = site_view.local_site;
if local_site.community_creation_admin_only && is_admin(&local_user_view).is_err() {
@ -75,8 +75,7 @@ impl PerformCrud for CreateCommunity {
&data.name,
&context.settings().get_protocol_and_hostname(),
)?;
let community_dupe =
Community::read_from_apub_id(context.conn().await?, &community_actor_id).await?;
let community_dupe = Community::read_from_apub_id(context.pool(), &community_actor_id).await?;
if community_dupe.is_some() {
return Err(LemmyError::from_message("community_already_exists"));
}
@ -101,7 +100,7 @@ impl PerformCrud for CreateCommunity {
.instance_id(site_view.site.instance_id)
.build();
let inserted_community = Community::create(context.conn().await?, &community_form)
let inserted_community = Community::create(context.pool(), &community_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_already_exists"))?;
@ -111,7 +110,7 @@ impl PerformCrud for CreateCommunity {
person_id: local_user_view.person.id,
};
CommunityModerator::join(context.conn().await?, &community_moderator_form)
CommunityModerator::join(context.pool(), &community_moderator_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
@ -122,21 +121,21 @@ impl PerformCrud for CreateCommunity {
pending: false,
};
CommunityFollower::follow(context.conn().await?, &community_follower_form)
CommunityFollower::follow(context.pool(), &community_follower_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
// Update the discussion_languages if that's provided
let community_id = inserted_community.id;
if let Some(languages) = data.discussion_languages.clone() {
let site_languages = SiteLanguage::read_local_raw(context.conn().await?).await?;
let site_languages = SiteLanguage::read_local_raw(context.pool()).await?;
// check that community languages are a subset of site languages
// https://stackoverflow.com/a/64227550
let is_subset = languages.iter().all(|item| site_languages.contains(item));
if !is_subset {
return Err(LemmyError::from_message("language_not_allowed"));
}
CommunityLanguage::update(context.conn().await?, languages, community_id).await?;
CommunityLanguage::update(context.pool(), languages, community_id).await?;
}
build_community_response(context, local_user_view, community_id).await

4
crates/api_crud/src/community/delete.rs
View File

@ -25,7 +25,7 @@ impl PerformCrud for DeleteCommunity {
// Fetch the community mods
let community_id = data.community_id;
let community_mods =
CommunityModeratorView::for_community(context.conn().await?, community_id).await?;
CommunityModeratorView::for_community(context.pool(), community_id).await?;
// Make sure deleter is the top mod
is_top_mod(&local_user_view, &community_mods)?;
@ -34,7 +34,7 @@ impl PerformCrud for DeleteCommunity {
let community_id = data.community_id;
let deleted = data.deleted;
Community::update(
context.conn().await?,
context.pool(),
community_id,
&CommunityUpdateForm::builder()
.deleted(Some(deleted))

4
crates/api_crud/src/community/list.rs
View File

@ -20,7 +20,7 @@ impl PerformCrud for ListCommunities {
) -> Result<ListCommunitiesResponse, LemmyError> {
let data: &ListCommunities = self;
let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), context).await;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let is_admin = local_user_view.as_ref().map(|luv| is_admin(luv).is_ok());
check_private_instance(&local_user_view, &local_site)?;
@ -32,7 +32,7 @@ impl PerformCrud for ListCommunities {
let limit = data.limit;
let local_user = local_user_view.map(|l| l.local_user);
let communities = CommunityQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.listing_type(listing_type)
.show_nsfw(show_nsfw)
.sort(sort)

4
crates/api_crud/src/community/remove.rs
View File

@ -31,7 +31,7 @@ impl PerformCrud for RemoveCommunity {
let community_id = data.community_id;
let removed = data.removed;
Community::update(
context.conn().await?,
context.pool(),
community_id,
&CommunityUpdateForm::builder()
.removed(Some(removed))
@ -49,7 +49,7 @@ impl PerformCrud for RemoveCommunity {
reason: data.reason.clone(),
expires,
};
ModRemoveCommunity::create(context.conn().await?, &form).await?;
ModRemoveCommunity::create(context.pool(), &form).await?;
build_community_response(context, local_user_view, community_id).await
}

15
crates/api_crud/src/community/update.rs
View File

@ -30,7 +30,7 @@ impl PerformCrud for EditCommunity {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<CommunityResponse, LemmyError> {
let data: &EditCommunity = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let icon = diesel_option_overwrite_to_url(&data.icon)?;
let banner = diesel_option_overwrite_to_url(&data.banner)?;
@ -43,24 +43,23 @@ impl PerformCrud for EditCommunity {
// Verify its a mod (only mods can edit it)
let community_id = data.community_id;
let mods: Vec<PersonId> =
CommunityModeratorView::for_community(context.conn().await?, community_id)
.await
.map(|v| v.into_iter().map(|m| m.moderator.id).collect())?;
let mods: Vec<PersonId> = CommunityModeratorView::for_community(context.pool(), community_id)
.await
.map(|v| v.into_iter().map(|m| m.moderator.id).collect())?;
if !mods.contains(&local_user_view.person.id) {
return Err(LemmyError::from_message("not_a_moderator"));
}
let community_id = data.community_id;
if let Some(languages) = data.discussion_languages.clone() {
let site_languages = SiteLanguage::read_local_raw(context.conn().await?).await?;
let site_languages = SiteLanguage::read_local_raw(context.pool()).await?;
// check that community languages are a subset of site languages
// https://stackoverflow.com/a/64227550
let is_subset = languages.iter().all(|item| site_languages.contains(item));
if !is_subset {
return Err(LemmyError::from_message("language_not_allowed"));
}
CommunityLanguage::update(context.conn().await?, languages, community_id).await?;
CommunityLanguage::update(context.pool(), languages, community_id).await?;
}
let community_form = CommunityUpdateForm::builder()
@ -74,7 +73,7 @@ impl PerformCrud for EditCommunity {
.build();
let community_id = data.community_id;
Community::update(context.conn().await?, community_id, &community_form)
Community::update(context.pool(), community_id, &community_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_community"))?;

8
crates/api_crud/src/custom_emoji/create.rs
View File

@ -22,7 +22,7 @@ impl PerformCrud for CreateCustomEmoji {
let data: &CreateCustomEmoji = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
// Make sure user is an admin
is_admin(&local_user_view)?;
@ -33,7 +33,7 @@ impl PerformCrud for CreateCustomEmoji {
.category(data.category.to_string())
.image_url(data.clone().image_url.into())
.build();
let emoji = CustomEmoji::create(context.conn().await?, &emoji_form).await?;
let emoji = CustomEmoji::create(context.pool(), &emoji_form).await?;
let mut keywords = vec![];
for keyword in &data.keywords {
let keyword_form = CustomEmojiKeywordInsertForm::builder()
@ -42,8 +42,8 @@ impl PerformCrud for CreateCustomEmoji {
.build();
keywords.push(keyword_form);
}
CustomEmojiKeyword::create(context.conn().await?, keywords).await?;
let view = CustomEmojiView::get(context.conn().await?, emoji.id).await?;
CustomEmojiKeyword::create(context.pool(), keywords).await?;
let view = CustomEmojiView::get(context.pool(), emoji.id).await?;
Ok(CustomEmojiResponse { custom_emoji: view })
}
}

2
crates/api_crud/src/custom_emoji/delete.rs
View File

@ -22,7 +22,7 @@ impl PerformCrud for DeleteCustomEmoji {
// Make sure user is an admin
is_admin(&local_user_view)?;
CustomEmoji::delete(context.conn().await?, data.id).await?;
CustomEmoji::delete(context.pool(), data.id).await?;
Ok(DeleteCustomEmojiResponse {
id: data.id,
success: true,

10
crates/api_crud/src/custom_emoji/update.rs
View File

@ -22,7 +22,7 @@ impl PerformCrud for EditCustomEmoji {
let data: &EditCustomEmoji = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
// Make sure user is an admin
is_admin(&local_user_view)?;
@ -32,8 +32,8 @@ impl PerformCrud for EditCustomEmoji {
.category(data.category.to_string())
.image_url(data.clone().image_url.into())
.build();
let emoji = CustomEmoji::update(context.conn().await?, data.id, &emoji_form).await?;
CustomEmojiKeyword::delete(context.conn().await?, data.id).await?;
let emoji = CustomEmoji::update(context.pool(), data.id, &emoji_form).await?;
CustomEmojiKeyword::delete(context.pool(), data.id).await?;
let mut keywords = vec![];
for keyword in &data.keywords {
let keyword_form = CustomEmojiKeywordInsertForm::builder()
@ -42,8 +42,8 @@ impl PerformCrud for EditCustomEmoji {
.build();
keywords.push(keyword_form);
}
CustomEmojiKeyword::create(context.conn().await?, keywords).await?;
let view = CustomEmojiView::get(context.conn().await?, emoji.id).await?;
CustomEmojiKeyword::create(context.pool(), keywords).await?;
let view = CustomEmojiView::get(context.pool(), emoji.id).await?;
Ok(CustomEmojiResponse { custom_emoji: view })
}
}

38
crates/api_crud/src/post/create.rs
View File

@ -46,7 +46,7 @@ impl PerformCrud for CreatePost {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<PostResponse, LemmyError> {
let data: &CreatePost = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let slur_regex = local_site_to_slur_regex(&local_site);
check_slurs(&data.name, &slur_regex)?;
@ -59,20 +59,15 @@ impl PerformCrud for CreatePost {
is_valid_post_title(&data.name)?;
is_valid_body_field(&data.body, true)?;
check_community_ban(
local_user_view.person.id,
data.community_id,
context.conn().await?,
)
.await?;
check_community_deleted_or_removed(data.community_id, context.conn().await?).await?;
check_community_ban(local_user_view.person.id, data.community_id, context.pool()).await?;
check_community_deleted_or_removed(data.community_id, context.pool()).await?;
let community_id = data.community_id;
let community = Community::read(context.conn().await?, community_id).await?;
let community = Community::read(context.pool(), community_id).await?;
if community.posting_restricted_to_mods {
let community_id = data.community_id;
let is_mod = CommunityView::is_mod_or_admin(
context.conn().await?,
context.pool(),
local_user_view.local_user.person_id,
community_id,
)
@ -92,20 +87,11 @@ impl PerformCrud for CreatePost {
let language_id = match data.language_id {
Some(lid) => Some(lid),
None => {
default_post_language(
context.conn().await?,
community_id,
local_user_view.local_user.id,
)
.await?
default_post_language(context.pool(), community_id, local_user_view.local_user.id).await?
}
};
CommunityLanguage::is_allowed_community_language(
context.conn().await?,
language_id,
community_id,
)
.await?;
CommunityLanguage::is_allowed_community_language(context.pool(), language_id, community_id)
.await?;
let post_form = PostInsertForm::builder()
.name(data.name.trim().to_owned())
@ -121,7 +107,7 @@ impl PerformCrud for CreatePost {
.thumbnail_url(thumbnail_url)
.build();
let inserted_post = Post::create(context.conn().await?, &post_form)
let inserted_post = Post::create(context.pool(), &post_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_post"))?;
@ -133,7 +119,7 @@ impl PerformCrud for CreatePost {
&protocol_and_hostname,
)?;
let updated_post = Post::update(
context.conn().await?,
context.pool(),
inserted_post_id,
&PostUpdateForm::builder().ap_id(Some(apub_id)).build(),
)
@ -149,12 +135,12 @@ impl PerformCrud for CreatePost {
score: 1,
};
PostLike::like(context.conn().await?, &like_form)
PostLike::like(context.pool(), &like_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_like_post"))?;
// Mark the post as read
mark_post_as_read(person_id, post_id, context.conn().await?).await?;
mark_post_as_read(person_id, post_id, context.pool()).await?;
if let Some(url) = &updated_post.url {
let mut webmention =

8
crates/api_crud/src/post/delete.rs
View File

@ -22,7 +22,7 @@ impl PerformCrud for DeletePost {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let post_id = data.post_id;
let orig_post = Post::read(context.conn().await?, post_id).await?;
let orig_post = Post::read(context.pool(), post_id).await?;
// Dont delete it if its already been deleted.
if orig_post.deleted == data.deleted {
@ -32,10 +32,10 @@ impl PerformCrud for DeletePost {
check_community_ban(
local_user_view.person.id,
orig_post.community_id,
context.conn().await?,
context.pool(),
)
.await?;
check_community_deleted_or_removed(orig_post.community_id, context.conn().await?).await?;
check_community_deleted_or_removed(orig_post.community_id, context.pool()).await?;
// Verify that only the creator can delete
if !Post::is_post_creator(local_user_view.person.id, orig_post.creator_id) {
@ -46,7 +46,7 @@ impl PerformCrud for DeletePost {
let post_id = data.post_id;
let deleted = data.deleted;
Post::update(
context.conn().await?,
context.pool(),
post_id,
&PostUpdateForm::builder().deleted(Some(deleted)).build(),
)

41
crates/api_crud/src/post/read.rs
View File

@ -27,7 +27,7 @@ impl PerformCrud for GetPost {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<GetPostResponse, LemmyError> {
let data: &GetPost = self;
let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), context).await;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
check_private_instance(&local_user_view, &local_site)?;
@ -37,7 +37,7 @@ impl PerformCrud for GetPost {
let post_id = if let Some(id) = data.id {
id
} else if let Some(comment_id) = data.comment_id {
Comment::read(context.conn().await?, comment_id)
Comment::read(context.pool(), comment_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?
.post_id
@ -46,35 +46,25 @@ impl PerformCrud for GetPost {
};
// Check to see if the person is a mod or admin, to show deleted / removed
let community_id = Post::read(context.conn().await?, post_id)
.await?
.community_id;
let is_mod_or_admin = is_mod_or_admin_opt(
context.conn().await?,
local_user_view.as_ref(),
Some(community_id),
)
.await
.is_ok();
let community_id = Post::read(context.pool(), post_id).await?.community_id;
let is_mod_or_admin =
is_mod_or_admin_opt(context.pool(), local_user_view.as_ref(), Some(community_id))
.await
.is_ok();
let post_view = PostView::read(
context.conn().await?,
post_id,
person_id,
Some(is_mod_or_admin),
)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?;
let post_view = PostView::read(context.pool(), post_id, person_id, Some(is_mod_or_admin))
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?;
// Mark the post as read
let post_id = post_view.post.id;
if let Some(person_id) = person_id {
mark_post_as_read(person_id, post_id, context.conn().await?).await?;
mark_post_as_read(person_id, post_id, context.pool()).await?;
}
// Necessary for the sidebar subscribed
let community_view = CommunityView::read(
context.conn().await?,
context.pool(),
community_id,
person_id,
Some(is_mod_or_admin),
@ -92,18 +82,17 @@ impl PerformCrud for GetPost {
read_comments,
..PersonPostAggregatesForm::default()
};
PersonPostAggregates::upsert(context.conn().await?, &person_post_agg_form)
PersonPostAggregates::upsert(context.pool(), &person_post_agg_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?;
}
let moderators =
CommunityModeratorView::for_community(context.conn().await?, community_id).await?;
let moderators = CommunityModeratorView::for_community(context.pool(), community_id).await?;
// Fetch the cross_posts
let cross_posts = if let Some(url) = &post_view.post.url {
let mut x_posts = PostQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.url_search(Some(url.inner().as_str().into()))
.build()
.list()

10
crates/api_crud/src/post/remove.rs
View File

@ -25,18 +25,18 @@ impl PerformCrud for RemovePost {
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let post_id = data.post_id;
let orig_post = Post::read(context.conn().await?, post_id).await?;
let orig_post = Post::read(context.pool(), post_id).await?;
check_community_ban(
local_user_view.person.id,
orig_post.community_id,
context.conn().await?,
context.pool(),
)
.await?;
// Verify that only the mods can remove
is_mod_or_admin(
context.conn().await?,
context.pool(),
local_user_view.person.id,
orig_post.community_id,
)
@ -46,7 +46,7 @@ impl PerformCrud for RemovePost {
let post_id = data.post_id;
let removed = data.removed;
Post::update(
context.conn().await?,
context.pool(),
post_id,
&PostUpdateForm::builder().removed(Some(removed)).build(),
)
@ -59,7 +59,7 @@ impl PerformCrud for RemovePost {
removed: Some(removed),
reason: data.reason.clone(),
};
ModRemovePost::create(context.conn().await?, &form).await?;
ModRemovePost::create(context.pool(), &form).await?;
build_post_response(
context,

10
crates/api_crud/src/post/update.rs
View File

@ -32,7 +32,7 @@ impl PerformCrud for EditPost {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<PostResponse, LemmyError> {
let data: &EditPost = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let data_url = data.url.as_ref();
@ -52,12 +52,12 @@ impl PerformCrud for EditPost {
is_valid_body_field(&data.body, true)?;
let post_id = data.post_id;
let orig_post = Post::read(context.conn().await?, post_id).await?;
let orig_post = Post::read(context.pool(), post_id).await?;
check_community_ban(
local_user_view.person.id,
orig_post.community_id,
context.conn().await?,
context.pool(),
)
.await?;
@ -76,7 +76,7 @@ impl PerformCrud for EditPost {
let language_id = self.language_id;
CommunityLanguage::is_allowed_community_language(
context.conn().await?,
context.pool(),
language_id,
orig_post.community_id,
)
@ -96,7 +96,7 @@ impl PerformCrud for EditPost {
.build();
let post_id = data.post_id;
Post::update(context.conn().await?, post_id, &post_form)
Post::update(context.pool(), post_id, &post_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_post"))?;

17
crates/api_crud/src/private_message/create.rs
View File

@ -37,7 +37,7 @@ impl PerformCrud for CreatePrivateMessage {
) -> Result<PrivateMessageResponse, LemmyError> {
let data: &CreatePrivateMessage = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
let content_slurs_removed = remove_slurs(
&data.content.clone(),
@ -45,12 +45,7 @@ impl PerformCrud for CreatePrivateMessage {
);
is_valid_body_field(&Some(content_slurs_removed.clone()), false)?;
check_person_block(
local_user_view.person.id,
data.recipient_id,
context.conn().await?,
)
.await?;
check_person_block(local_user_view.person.id, data.recipient_id, context.pool()).await?;
let private_message_form = PrivateMessageInsertForm::builder()
.content(content_slurs_removed.clone())
@ -59,7 +54,7 @@ impl PerformCrud for CreatePrivateMessage {
.build();
let inserted_private_message =
match PrivateMessage::create(context.conn().await?, &private_message_form).await {
match PrivateMessage::create(context.pool(), &private_message_form).await {
Ok(private_message) => private_message,
Err(e) => {
return Err(LemmyError::from_error_message(
@ -77,7 +72,7 @@ impl PerformCrud for CreatePrivateMessage {
&protocol_and_hostname,
)?;
PrivateMessage::update(
context.conn().await?,
context.pool(),
inserted_private_message.id,
&PrivateMessageUpdateForm::builder()
.ap_id(Some(apub_id))
@ -86,12 +81,12 @@ impl PerformCrud for CreatePrivateMessage {
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_private_message"))?;
let view = PrivateMessageView::read(context.conn().await?, inserted_private_message.id).await?;
let view = PrivateMessageView::read(context.pool(), inserted_private_message.id).await?;
// Send email to the local recipient, if one exists
if view.recipient.local {
let recipient_id = data.recipient_id;
let local_recipient = LocalUserView::read_person(context.conn().await?, recipient_id).await?;
let local_recipient = LocalUserView::read_person(context.pool(), recipient_id).await?;
let lang = get_interface_language(&local_recipient);
let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname());
let sender_name = &local_user_view.person.name;

7
crates/api_crud/src/private_message/delete.rs
View File

@ -26,8 +26,7 @@ impl PerformCrud for DeletePrivateMessage {
// Checking permissions
let private_message_id = data.private_message_id;
let orig_private_message =
PrivateMessage::read(context.conn().await?, private_message_id).await?;
let orig_private_message = PrivateMessage::read(context.pool(), private_message_id).await?;
if local_user_view.person.id != orig_private_message.creator_id {
return Err(LemmyError::from_message("no_private_message_edit_allowed"));
}
@ -36,7 +35,7 @@ impl PerformCrud for DeletePrivateMessage {
let private_message_id = data.private_message_id;
let deleted = data.deleted;
PrivateMessage::update(
context.conn().await?,
context.pool(),
private_message_id,
&PrivateMessageUpdateForm::builder()
.deleted(Some(deleted))
@ -45,7 +44,7 @@ impl PerformCrud for DeletePrivateMessage {
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
let view = PrivateMessageView::read(context.conn().await?, private_message_id).await?;
let view = PrivateMessageView::read(context.pool(), private_message_id).await?;
Ok(PrivateMessageResponse {
private_message_view: view,
})

2
crates/api_crud/src/private_message/read.rs
View File

@ -25,7 +25,7 @@ impl PerformCrud for GetPrivateMessages {
let limit = data.limit;
let unread_only = data.unread_only;
let mut messages = PrivateMessageQuery::builder()
.conn(context.conn().await?)
.pool(context.pool())
.recipient_id(person_id)
.page(page)
.limit(limit)

9
crates/api_crud/src/private_message/update.rs
View File

@ -30,12 +30,11 @@ impl PerformCrud for EditPrivateMessage {
) -> Result<PrivateMessageResponse, LemmyError> {
let data: &EditPrivateMessage = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
// Checking permissions
let private_message_id = data.private_message_id;
let orig_private_message =
PrivateMessage::read(context.conn().await?, private_message_id).await?;
let orig_private_message = PrivateMessage::read(context.pool(), private_message_id).await?;
if local_user_view.person.id != orig_private_message.creator_id {
return Err(LemmyError::from_message("no_private_message_edit_allowed"));
}
@ -46,7 +45,7 @@ impl PerformCrud for EditPrivateMessage {
let private_message_id = data.private_message_id;
PrivateMessage::update(
context.conn().await?,
context.pool(),
private_message_id,
&PrivateMessageUpdateForm::builder()
.content(Some(content_slurs_removed))
@ -56,7 +55,7 @@ impl PerformCrud for EditPrivateMessage {
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
let view = PrivateMessageView::read(context.conn().await?, private_message_id).await?;
let view = PrivateMessageView::read(context.pool(), private_message_id).await?;
Ok(PrivateMessageResponse {
private_message_view: view,

13
crates/api_crud/src/site/create.rs
View File

@ -48,9 +48,8 @@ impl PerformCrud for CreateSite {
#[tracing::instrument(skip(context))]
async fn perform(&self, context: &Data<LemmyContext>) -> Result<SiteResponse, LemmyError> {
let data: &CreateSite = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.conn().await?).await?;
let local_site = LocalSite::read(context.pool()).await?;
// Make sure user is an admin; other types of users should not create site data...
is_admin(&local_user_view)?;
@ -75,7 +74,7 @@ impl PerformCrud for CreateSite {
let site_id = local_site.site_id;
Site::update(context.conn().await?, site_id, &site_form).await?;
Site::update(context.pool(), site_id, &site_form).await?;
let local_site_form = LocalSiteUpdateForm::builder()
// Set the site setup to true
@ -100,7 +99,7 @@ impl PerformCrud for CreateSite {
.captcha_difficulty(data.captcha_difficulty.clone())
.build();
LocalSite::update(context.conn().await?, &local_site_form).await?;
LocalSite::update(context.pool(), &local_site_form).await?;
let local_site_rate_limit_form = LocalSiteRateLimitUpdateForm::builder()
.message(data.rate_limit_message)
@ -117,12 +116,12 @@ impl PerformCrud for CreateSite {
.search_per_second(data.rate_limit_search_per_second)
.build();
LocalSiteRateLimit::update(context.conn().await?, &local_site_rate_limit_form).await?;
LocalSiteRateLimit::update(context.pool(), &local_site_rate_limit_form).await?;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let new_taglines = data.taglines.clone();
let taglines = Tagline::replace(context.conn().await?, local_site.id, new_taglines).await?;
let taglines = Tagline::replace(context.pool(), local_site.id, new_taglines).await?;
let rate_limit_config =
local_site_rate_limit_to_rate_limit_config(&site_view.local_site_rate_limit);

25
crates/api_crud/src/site/read.rs
View File

@ -32,9 +32,9 @@ impl PerformCrud for GetSite {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<GetSiteResponse, LemmyError> {
let data: &GetSite = self;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let admins = PersonView::admins(context.conn().await?).await?;
let admins = PersonView::admins(context.pool()).await?;
// Build the local user
let my_user = if let Some(local_user_view) =
@ -43,25 +43,25 @@ impl PerformCrud for GetSite {
let person_id = local_user_view.person.id;
let local_user_id = local_user_view.local_user.id;
let follows = CommunityFollowerView::for_person(context.conn().await?, person_id)
let follows = CommunityFollowerView::for_person(context.pool(), person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "system_err_login"))?;
let person_id = local_user_view.person.id;
let community_blocks = CommunityBlockView::for_person(context.conn().await?, person_id)
let community_blocks = CommunityBlockView::for_person(context.pool(), person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "system_err_login"))?;
let person_id = local_user_view.person.id;
let person_blocks = PersonBlockView::for_person(context.conn().await?, person_id)
let person_blocks = PersonBlockView::for_person(context.pool(), person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "system_err_login"))?;
let moderates = CommunityModeratorView::for_person(context.conn().await?, person_id)
let moderates = CommunityModeratorView::for_person(context.pool(), person_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "system_err_login"))?;
let discussion_languages = LocalUserLanguage::read(context.conn().await?, local_user_id)
let discussion_languages = LocalUserLanguage::read(context.pool(), local_user_id)
.await
.map_err(|e| LemmyError::from_error_message(e, "system_err_login"))?;
@ -77,11 +77,10 @@ impl PerformCrud for GetSite {
None
};
let all_languages = Language::read_all(context.conn().await?).await?;
let discussion_languages = SiteLanguage::read_local_raw(context.conn().await?).await?;
let taglines = Tagline::get_all(context.conn().await?, site_view.local_site.id).await?;
let custom_emojis =
CustomEmojiView::get_all(context.conn().await?, site_view.local_site.id).await?;
let all_languages = Language::read_all(context.pool()).await?;
let discussion_languages = SiteLanguage::read_local_raw(context.pool()).await?;
let taglines = Tagline::get_all(context.pool(), site_view.local_site.id).await?;
let custom_emojis = CustomEmojiView::get_all(context.pool(), site_view.local_site.id).await?;
Ok(GetSiteResponse {
site_view,
@ -107,7 +106,7 @@ async fn local_user_settings_view_from_jwt_opt(
.ok()?
.claims;
let local_user_id = LocalUserId(claims.sub);
let local_user_view = LocalUserView::read(context.conn().await.ok()?, local_user_id)
let local_user_view = LocalUserView::read(context.pool(), local_user_id)
.await
.ok()?;
check_user_valid(

22
crates/api_crud/src/site/update.rs
View File

@ -46,7 +46,7 @@ impl PerformCrud for EditSite {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<SiteResponse, LemmyError> {
let data: &EditSite = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let local_site = site_view.local_site;
let site = site_view.site;
@ -56,7 +56,7 @@ impl PerformCrud for EditSite {
validate_update_payload(&local_site, data)?;
if let Some(discussion_languages) = data.discussion_languages.clone() {
SiteLanguage::update(context.conn().await?, discussion_languages.clone(), &site).await?;
SiteLanguage::update(context.pool(), discussion_languages.clone(), &site).await?;
}
let site_form = SiteUpdateForm::builder()
@ -68,7 +68,7 @@ impl PerformCrud for EditSite {
.updated(Some(Some(naive_now())))
.build();
Site::update(context.conn().await?, site.id, &site_form)
Site::update(context.pool(), site.id, &site_form)
.await
// Ignore errors for all these, so as to not throw errors if no update occurs
// Diesel will throw an error for empty update forms
@ -96,7 +96,7 @@ impl PerformCrud for EditSite {
.reports_email_admins(data.reports_email_admins)
.build();
let update_local_site = LocalSite::update(context.conn().await?, &local_site_form)
let update_local_site = LocalSite::update(context.pool(), &local_site_form)
.await
.ok();
@ -115,15 +115,15 @@ impl PerformCrud for EditSite {
.search_per_second(data.rate_limit_search_per_second)
.build();
LocalSiteRateLimit::update(context.conn().await?, &local_site_rate_limit_form)
LocalSiteRateLimit::update(context.pool(), &local_site_rate_limit_form)
.await
.ok();
// Replace the blocked and allowed instances
let allowed = data.allowed_instances.clone();
FederationAllowList::replace(context.conn().await?, allowed).await?;
FederationAllowList::replace(context.pool(), allowed).await?;
let blocked = data.blocked_instances.clone();
FederationBlockList::replace(context.conn().await?, blocked).await?;
FederationBlockList::replace(context.pool(), blocked).await?;
// TODO can't think of a better way to do this.
// If the server suddenly requires email verification, or required applications, no old users
@ -137,7 +137,7 @@ impl PerformCrud for EditSite {
.map(|ols| ols.registration_mode == RegistrationMode::RequireApplication)
.unwrap_or(false);
if !old_require_application && new_require_application {
LocalUser::set_all_users_registration_applications_accepted(context.conn().await?)
LocalUser::set_all_users_registration_applications_accepted(context.pool())
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_registrations_accepted"))?;
}
@ -147,15 +147,15 @@ impl PerformCrud for EditSite {
.map(|ols| ols.require_email_verification)
.unwrap_or(false);
if !local_site.require_email_verification && new_require_email_verification {
LocalUser::set_all_users_email_verified(context.conn().await?)
LocalUser::set_all_users_email_verified(context.pool())
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_email_verified"))?;
}
let new_taglines = data.taglines.clone();
let taglines = Tagline::replace(context.conn().await?, local_site.id, new_taglines).await?;
let taglines = Tagline::replace(context.pool(), local_site.id, new_taglines).await?;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let rate_limit_config =
local_site_rate_limit_to_rate_limit_config(&site_view.local_site_rate_limit);

23
crates/api_crud/src/user/create.rs
View File

@ -45,7 +45,7 @@ impl PerformCrud for Register {
async fn perform(&self, context: &Data<LemmyContext>) -> Result<LoginResponse, LemmyError> {
let data: &Register = self;
let site_view = SiteView::read_local(context.conn().await?).await?;
let site_view = SiteView::read_local(context.pool()).await?;
let local_site = site_view.local_site;
let require_registration_application =
local_site.registration_mode == RegistrationMode::RequireApplication;
@ -76,7 +76,7 @@ impl PerformCrud for Register {
if let Some(captcha_uuid) = &data.captcha_uuid {
let uuid = uuid::Uuid::parse_str(captcha_uuid)?;
let check = CaptchaAnswer::check_captcha(
context.conn().await?,
context.pool(),
CheckCaptchaAnswer {
uuid,
answer: data.captcha_answer.clone().unwrap_or_default(),
@ -104,7 +104,7 @@ impl PerformCrud for Register {
)?;
if let Some(email) = &data.email {
if LocalUser::is_email_taken(context.conn().await?, email).await? {
if LocalUser::is_email_taken(context.pool(), email).await? {
return Err(LemmyError::from_message("email_already_exists"));
}
}
@ -125,7 +125,7 @@ impl PerformCrud for Register {
.build();
// insert the person
let inserted_person = Person::create(context.conn().await?, &person_form)
let inserted_person = Person::create(context.pool(), &person_form)
.await
.map_err(|e| LemmyError::from_error_message(e, "user_already_exists"))?;
@ -142,7 +142,7 @@ impl PerformCrud for Register {
.accepted_application(accepted_application)
.build();
let inserted_local_user = LocalUser::create(context.conn().await?, &local_user_form).await?;
let inserted_local_user = LocalUser::create(context.pool(), &local_user_form).await?;
if local_site.site_setup && require_registration_application {
// Create the registration application
@ -152,12 +152,12 @@ impl PerformCrud for Register {
answer: data.answer.clone().expect("must have an answer"),
};
RegistrationApplication::create(context.conn().await?, &form).await?;
RegistrationApplication::create(context.pool(), &form).await?;
}
// Email the admins
if local_site.application_email_admins {
send_new_applicant_email_to_admins(&data.username, context.conn().await?, context.settings())
send_new_applicant_email_to_admins(&data.username, context.pool(), context.settings())
.await?;
}
@ -193,13 +193,8 @@ impl PerformCrud for Register {
.clone()
.expect("email was provided");
send_verification_email(
&local_user_view,
&email,
context.conn().await?,
context.settings(),
)
.await?;
send_verification_email(&local_user_view, &email, context.pool(), context.settings())
.await?;
login_response.verify_email_sent = true;
}

14
crates/apub/src/activities/block/block_user.rs
View File

@ -60,7 +60,7 @@ impl BlockUser {
actor: mod_.id().into(),
to: vec![public()],
object: user.id().into(),
cc: generate_cc(target, context.conn().await?).await?,
cc: generate_cc(target, context.pool()).await?,
target: target.id(),
kind: BlockType::Block,
remove_data,
@ -97,7 +97,7 @@ impl BlockUser {
match target {
SiteOrCommunity::Site(_) => {
let inboxes = remote_instance_inboxes(context.conn().await?).await?;
let inboxes = remote_instance_inboxes(context.pool()).await?;
send_lemmy_activity(context, block, mod_, inboxes, false).await
}
SiteOrCommunity::Community(c) => {
@ -155,7 +155,7 @@ impl ActivityHandler for BlockUser {
match target {
SiteOrCommunity::Site(_site) => {
let blocked_person = Person::update(
context.conn().await?,
context.pool(),
blocked_person.id,
&PersonUpdateForm::builder()
.banned(Some(true))
@ -181,7 +181,7 @@ impl ActivityHandler for BlockUser {
banned: Some(true),
expires,
};
ModBan::create(context.conn().await?, &form).await?;
ModBan::create(context.pool(), &form).await?;
}
SiteOrCommunity::Community(community) => {
let community_user_ban_form = CommunityPersonBanForm {
@ -189,7 +189,7 @@ impl ActivityHandler for BlockUser {
person_id: blocked_person.id,
expires: Some(expires),
};
CommunityPersonBan::ban(context.conn().await?, &community_user_ban_form).await?;
CommunityPersonBan::ban(context.pool(), &community_user_ban_form).await?;
// Also unsubscribe them from the community, if they are subscribed
let community_follower_form = CommunityFollowerForm {
@ -197,7 +197,7 @@ impl ActivityHandler for BlockUser {
person_id: blocked_person.id,
pending: false,
};
CommunityFollower::unfollow(context.conn().await?, &community_follower_form)
CommunityFollower::unfollow(context.pool(), &community_follower_form)
.await
.ok();
@ -214,7 +214,7 @@ impl ActivityHandler for BlockUser {
banned: Some(true),
expires,
};
ModBanFromCommunity::create(context.conn().await?, &form).await?;
ModBanFromCommunity::create(context.pool(), &form).await?;
}
}

19
crates/apub/src/activities/block/mod.rs
View File

@ -21,7 +21,7 @@ use lemmy_api_common::{
use lemmy_db_schema::{
source::{community::Community, person::Person, site::Site},
traits::Crud,
utils::GetConn,
utils::DbPool,
};
use lemmy_db_views::structs::SiteView;
use lemmy_utils::{error::LemmyError, utils::time::naive_from_unix};
@ -118,9 +118,9 @@ impl SiteOrCommunity {
}
}
async fn generate_cc(target: &SiteOrCommunity, conn: impl GetConn) -> Result<Vec<Url>, LemmyError> {
async fn generate_cc(target: &SiteOrCommunity, pool: &DbPool) -> Result<Vec<Url>, LemmyError> {
Ok(match target {
SiteOrCommunity::Site(_) => Site::read_remote_sites(conn)
SiteOrCommunity::Site(_) => Site::read_remote_sites(pool)
.await?
.into_iter()
.map(|s| s.actor_id.into())
@ -139,13 +139,8 @@ impl SendActivity for BanPerson {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let person = Person::read(context.conn().await?, request.person_id).await?;
let site = SiteOrCommunity::Site(
SiteView::read_local(context.conn().await?)
.await?
.site
.into(),
);
let person = Person::read(context.pool(), request.person_id).await?;
let site = SiteOrCommunity::Site(SiteView::read_local(context.pool()).await?.site.into());
let expires = request.expires.map(naive_from_unix);
// if the action affects a local user, federate to other instances
@ -187,10 +182,10 @@ impl SendActivity for BanFromCommunity {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community: ApubCommunity = Community::read(context.conn().await?, request.community_id)
let community: ApubCommunity = Community::read(context.pool(), request.community_id)
.await?
.into();
let banned_person: ApubPerson = Person::read(context.conn().await?, request.person_id)
let banned_person: ApubPerson = Person::read(context.pool(), request.person_id)
.await?
.into();
let expires = request.expires.map(naive_from_unix);

12
crates/apub/src/activities/block/undo_block_user.rs
View File

@ -53,7 +53,7 @@ impl UndoBlockUser {
actor: mod_.id().into(),
to: vec![public()],
object: block,
cc: generate_cc(target, context.conn().await?).await?,
cc: generate_cc(target, context.pool()).await?,
kind: UndoType::Undo,
id: id.clone(),
audience,
@ -62,7 +62,7 @@ impl UndoBlockUser {
let mut inboxes = vec![user.shared_inbox_or_inbox()];
match target {
SiteOrCommunity::Site(_) => {
inboxes.append(&mut remote_instance_inboxes(context.conn().await?).await?);
inboxes.append(&mut remote_instance_inboxes(context.pool()).await?);
send_lemmy_activity(context, undo, mod_, inboxes, false).await
}
SiteOrCommunity::Community(c) => {
@ -103,7 +103,7 @@ impl ActivityHandler for UndoBlockUser {
match self.object.target.dereference(context).await? {
SiteOrCommunity::Site(_site) => {
let blocked_person = Person::update(
context.conn().await?,
context.pool(),
blocked_person.id,
&PersonUpdateForm::builder()
.banned(Some(false))
@ -120,7 +120,7 @@ impl ActivityHandler for UndoBlockUser {
banned: Some(false),
expires,
};
ModBan::create(context.conn().await?, &form).await?;
ModBan::create(context.pool(), &form).await?;
}
SiteOrCommunity::Community(community) => {
let community_user_ban_form = CommunityPersonBanForm {
@ -128,7 +128,7 @@ impl ActivityHandler for UndoBlockUser {
person_id: blocked_person.id,
expires: None,
};
CommunityPersonBan::unban(context.conn().await?, &community_user_ban_form).await?;
CommunityPersonBan::unban(context.pool(), &community_user_ban_form).await?;
// write to mod log
let form = ModBanFromCommunityForm {
@ -139,7 +139,7 @@ impl ActivityHandler for UndoBlockUser {
banned: Some(false),
expires,
};
ModBanFromCommunity::create(context.conn().await?, &form).await?;
ModBanFromCommunity::create(context.pool(), &form).await?;
}
}

17
crates/apub/src/activities/community/collection_add.rs
View File

@ -119,7 +119,7 @@ impl ActivityHandler for CollectionAdd {
async fn receive(self, context: &Data<Self::DataType>) -> Result<(), LemmyError> {
insert_activity(&self.id, &self, false, false, context).await?;
let (community, collection_type) =
Community::get_by_collection_url(context.conn().await?, &self.target.into()).await?;
Community::get_by_collection_url(context.pool(), &self.target.into()).await?;
match collection_type {
CollectionType::Moderators => {
let new_mod = ObjectId::<ApubPerson>::from(self.object)
@ -130,14 +130,13 @@ impl ActivityHandler for CollectionAdd {
// been added. Skip it here as it would result in a duplicate key error.
let new_mod_id = new_mod.id;
let moderated_communities =
CommunityModerator::get_person_moderated_communities(context.conn().await?, new_mod_id)
.await?;
CommunityModerator::get_person_moderated_communities(context.pool(), new_mod_id).await?;
if !moderated_communities.contains(&community.id) {
let form = CommunityModeratorForm {
community_id: community.id,
person_id: new_mod.id,
};
CommunityModerator::join(context.conn().await?, &form).await?;
CommunityModerator::join(context.pool(), &form).await?;
// write mod log
let actor = self.actor.dereference(context).await?;
@ -147,7 +146,7 @@ impl ActivityHandler for CollectionAdd {
community_id: community.id,
removed: Some(false),
};
ModAddCommunity::create(context.conn().await?, &form).await?;
ModAddCommunity::create(context.pool(), &form).await?;
}
// TODO: send websocket notification about added mod
}
@ -158,7 +157,7 @@ impl ActivityHandler for CollectionAdd {
let form = PostUpdateForm::builder()
.featured_community(Some(true))
.build();
Post::update(context.conn().await?, post.id, &form).await?;
Post::update(context.pool(), post.id, &form).await?;
}
}
Ok(())
@ -175,10 +174,10 @@ impl SendActivity for AddModToCommunity {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community: ApubCommunity = Community::read(context.conn().await?, request.community_id)
let community: ApubCommunity = Community::read(context.pool(), request.community_id)
.await?
.into();
let updated_mod: ApubPerson = Person::read(context.conn().await?, request.person_id)
let updated_mod: ApubPerson = Person::read(context.pool(), request.person_id)
.await?
.into();
if request.added {
@ -211,7 +210,7 @@ impl SendActivity for FeaturePost {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, response.post_view.community.id)
let community = Community::read(context.pool(), response.post_view.community.id)
.await?
.into();
let post = response.post_view.post.clone().into();

8
crates/apub/src/activities/community/collection_remove.rs
View File

@ -112,7 +112,7 @@ impl ActivityHandler for CollectionRemove {
async fn receive(self, context: &Data<Self::DataType>) -> Result<(), LemmyError> {
insert_activity(&self.id, &self, false, false, context).await?;
let (community, collection_type) =
Community::get_by_collection_url(context.conn().await?, &self.target.into()).await?;
Community::get_by_collection_url(context.pool(), &self.target.into()).await?;
match collection_type {
CollectionType::Moderators => {
let remove_mod = ObjectId::<ApubPerson>::from(self.object)
@ -123,7 +123,7 @@ impl ActivityHandler for CollectionRemove {
community_id: community.id,
person_id: remove_mod.id,
};
CommunityModerator::leave(context.conn().await?, &form).await?;
CommunityModerator::leave(context.pool(), &form).await?;
// write mod log
let actor = self.actor.dereference(context).await?;
@ -133,7 +133,7 @@ impl ActivityHandler for CollectionRemove {
community_id: community.id,
removed: Some(true),
};
ModAddCommunity::create(context.conn().await?, &form).await?;
ModAddCommunity::create(context.pool(), &form).await?;
// TODO: send websocket notification about removed mod
}
@ -144,7 +144,7 @@ impl ActivityHandler for CollectionRemove {
let form = PostUpdateForm::builder()
.featured_community(Some(false))
.build();
Post::update(context.conn().await?, post.id, &form).await?;
Post::update(context.pool(), post.id, &form).await?;
}
}
Ok(())

6
crates/apub/src/activities/community/lock_page.rs
View File

@ -60,7 +60,7 @@ impl ActivityHandler for LockPage {
async fn receive(self, context: &Data<Self::DataType>) -> Result<(), Self::Error> {
let form = PostUpdateForm::builder().locked(Some(true)).build();
let post = self.object.dereference(context).await?;
Post::update(context.conn().await?, post.id, &form).await?;
Post::update(context.pool(), post.id, &form).await?;
Ok(())
}
}
@ -97,7 +97,7 @@ impl ActivityHandler for UndoLockPage {
insert_activity(&self.id, &self, false, false, context).await?;
let form = PostUpdateForm::builder().locked(Some(false)).build();
let post = self.object.object.dereference(context).await?;
Post::update(context.conn().await?, post.id, &form).await?;
Post::update(context.pool(), post.id, &form).await?;
Ok(())
}
}
@ -145,7 +145,7 @@ impl SendActivity for LockPost {
};
AnnouncableActivities::UndoLockPost(undo)
};
let community = Community::read(context.conn().await?, response.post_view.community.id).await?;
let community = Community::read(context.pool(), response.post_view.community.id).await?;
send_activity_in_community(
activity,
&local_user_view.person.into(),

2
crates/apub/src/activities/community/mod.rs
View File

@ -44,7 +44,7 @@ pub(crate) async fn send_activity_in_community(
// send to user followers
if !is_mod_action {
inboxes.extend(
&mut PersonFollower::list_followers(context.conn().await?, actor.id)
&mut PersonFollower::list_followers(context.pool(), actor.id)
.await?
.into_iter()
.map(|p| ApubPerson(p).shared_inbox_or_inbox()),

4
crates/apub/src/activities/community/report.rs
View File

@ -134,7 +134,7 @@ impl ActivityHandler for Report {
reason: self.summary,
original_post_body: post.body.clone(),
};
PostReport::report(context.conn().await?, &report_form).await?;
PostReport::report(context.pool(), &report_form).await?;
}
PostOrComment::Comment(comment) => {
let report_form = CommentReportForm {
@ -143,7 +143,7 @@ impl ActivityHandler for Report {
original_comment_text: comment.content.clone(),
reason: self.summary,
};
CommentReport::report(context.conn().await?, &report_form).await?;
CommentReport::report(context.pool(), &report_form).await?;
}
};
Ok(())

6
crates/apub/src/activities/community/update.rs
View File

@ -36,7 +36,7 @@ impl SendActivity for EditCommunity {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, request.community_id).await?;
let community = Community::read(context.pool(), request.community_id).await?;
UpdateCommunity::send(community.into(), &local_user_view.person.into(), context).await
}
}
@ -97,7 +97,7 @@ impl ActivityHandler for UpdateCommunity {
let community_update_form = self.object.into_update_form();
Community::update(context.conn().await?, community.id, &community_update_form).await?;
Community::update(context.pool(), community.id, &community_update_form).await?;
Ok(())
}
}
@ -112,7 +112,7 @@ impl SendActivity for HideCommunity {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, request.community_id).await?;
let community = Community::read(context.pool(), request.community_id).await?;
UpdateCommunity::send(community.into(), &local_user_view.person.into(), context).await
}
}

16
crates/apub/src/activities/create_or_update/comment.rs
View File

@ -91,12 +91,10 @@ impl CreateOrUpdateNote {
) -> Result<(), LemmyError> {
// TODO: might be helpful to add a comment method to retrieve community directly
let post_id = comment.post_id;
let post = Post::read(context.conn().await?, post_id).await?;
let post = Post::read(context.pool(), post_id).await?;
let community_id = post.community_id;
let person: ApubPerson = Person::read(context.conn().await?, person_id).await?.into();
let community: ApubCommunity = Community::read(context.conn().await?, community_id)
.await?
.into();
let person: ApubPerson = Person::read(context.pool(), person_id).await?.into();
let community: ApubCommunity = Community::read(context.pool(), community_id).await?.into();
let id = generate_activity_id(
kind.clone(),
@ -179,7 +177,7 @@ impl ActivityHandler for CreateOrUpdateNote {
if distinguished != existing_comment.distinguished {
let creator = self.actor.dereference(context).await?;
let (post, _) = self.object.get_parents(context).await?;
is_mod_or_admin(context.conn().await?, creator.id, post.community_id).await?;
is_mod_or_admin(context.pool(), creator.id, post.community_id).await?;
}
}
@ -192,14 +190,14 @@ impl ActivityHandler for CreateOrUpdateNote {
person_id: comment.creator_id,
score: 1,
};
CommentLike::like(context.conn().await?, &like_form).await?;
CommentLike::like(context.pool(), &like_form).await?;
// Calculate initial hot_rank
CommentAggregates::update_hot_rank(context.conn().await?, comment.id).await?;
CommentAggregates::update_hot_rank(context.pool(), comment.id).await?;
let do_send_email = self.kind == CreateOrUpdateType::Create;
let post_id = comment.post_id;
let post = Post::read(context.conn().await?, post_id).await?;
let post = Post::read(context.pool(), post_id).await?;
let actor = self.actor.dereference(context).await?;
// Note:

10
crates/apub/src/activities/create_or_update/post.rs
View File

@ -109,10 +109,8 @@ impl CreateOrUpdatePage {
) -> Result<(), LemmyError> {
let post = ApubPost(post.clone());
let community_id = post.community_id;
let person: ApubPerson = Person::read(context.conn().await?, person_id).await?.into();
let community: ApubCommunity = Community::read(context.conn().await?, community_id)
.await?
.into();
let person: ApubPerson = Person::read(context.pool(), person_id).await?.into();
let community: ApubCommunity = Community::read(context.pool(), community_id).await?.into();
let create_or_update =
CreateOrUpdatePage::new(post, &person, &community, kind, context).await?;
@ -189,10 +187,10 @@ impl ActivityHandler for CreateOrUpdatePage {
person_id: post.creator_id,
score: 1,
};
PostLike::like(context.conn().await?, &like_form).await?;
PostLike::like(context.pool(), &like_form).await?;
// Calculate initial hot_rank for post
PostAggregates::update_hot_rank(context.conn().await?, post.id).await?;
PostAggregates::update_hot_rank(context.pool(), post.id).await?;
Ok(())
}

6
crates/apub/src/activities/create_or_update/private_message.rs
View File

@ -71,10 +71,8 @@ impl CreateOrUpdateChatMessage {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let recipient_id = private_message.recipient_id;
let sender: ApubPerson = Person::read(context.conn().await?, sender_id).await?.into();
let recipient: ApubPerson = Person::read(context.conn().await?, recipient_id)
.await?
.into();
let sender: ApubPerson = Person::read(context.pool(), sender_id).await?.into();
let recipient: ApubPerson = Person::read(context.pool(), recipient_id).await?.into();
let id = generate_activity_id(
kind.clone(),

12
crates/apub/src/activities/deletion/delete.rs
View File

@ -119,9 +119,9 @@ pub(in crate::activities) async fn receive_remove_action(
reason,
expires: None,
};
ModRemoveCommunity::create(context.conn().await?, &form).await?;
ModRemoveCommunity::create(context.pool(), &form).await?;
Community::update(
context.conn().await?,
context.pool(),
community.id,
&CommunityUpdateForm::builder().removed(Some(true)).build(),
)
@ -134,9 +134,9 @@ pub(in crate::activities) async fn receive_remove_action(
removed: Some(true),
reason,
};
ModRemovePost::create(context.conn().await?, &form).await?;
ModRemovePost::create(context.pool(), &form).await?;
Post::update(
context.conn().await?,
context.pool(),
post.id,
&PostUpdateForm::builder().removed(Some(true)).build(),
)
@ -149,9 +149,9 @@ pub(in crate::activities) async fn receive_remove_action(
removed: Some(true),
reason,
};
ModRemoveComment::create(context.conn().await?, &form).await?;
ModRemoveComment::create(context.pool(), &form).await?;
Comment::update(
context.conn().await?,
context.pool(),
comment.id,
&CommentUpdateForm::builder().removed(Some(true)).build(),
)

2
crates/apub/src/activities/deletion/delete_user.rs
View File

@ -51,7 +51,7 @@ impl SendActivity for DeleteAccount {
cc: vec![],
};
let inboxes = remote_instance_inboxes(context.conn().await?).await?;
let inboxes = remote_instance_inboxes(context.pool()).await?;
send_lemmy_activity(context, delete, &actor, inboxes, true).await?;
Ok(())
}

29
crates/apub/src/activities/deletion/mod.rs
View File

@ -64,7 +64,7 @@ impl SendActivity for DeletePost {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, response.post_view.community.id).await?;
let community = Community::read(context.pool(), response.post_view.community.id).await?;
let deletable = DeletableObjects::Post(response.post_view.post.clone().into());
send_apub_delete_in_community(
local_user_view.person,
@ -88,7 +88,7 @@ impl SendActivity for RemovePost {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, response.post_view.community.id).await?;
let community = Community::read(context.pool(), response.post_view.community.id).await?;
let deletable = DeletableObjects::Post(response.post_view.post.clone().into());
send_apub_delete_in_community(
local_user_view.person,
@ -112,8 +112,8 @@ impl SendActivity for DeleteComment {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let community_id = response.comment_view.community.id;
let community = Community::read(context.conn().await?, community_id).await?;
let person = Person::read(context.conn().await?, response.comment_view.creator.id).await?;
let community = Community::read(context.pool(), community_id).await?;
let person = Person::read(context.pool(), response.comment_view.creator.id).await?;
let deletable = DeletableObjects::Comment(response.comment_view.comment.clone().into());
send_apub_delete_in_community(person, community, deletable, None, request.deleted, context)
.await
@ -130,9 +130,8 @@ impl SendActivity for RemoveComment {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let comment = Comment::read(context.conn().await?, request.comment_id).await?;
let community =
Community::read(context.conn().await?, response.comment_view.community.id).await?;
let comment = Comment::read(context.pool(), request.comment_id).await?;
let community = Community::read(context.pool(), response.comment_view.community.id).await?;
let deletable = DeletableObjects::Comment(comment.into());
send_apub_delete_in_community(
local_user_view.person,
@ -176,7 +175,7 @@ impl SendActivity for DeleteCommunity {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, request.community_id).await?;
let community = Community::read(context.pool(), request.community_id).await?;
let deletable = DeletableObjects::Community(community.clone().into());
send_apub_delete_in_community(
local_user_view.person,
@ -200,7 +199,7 @@ impl SendActivity for RemoveCommunity {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, request.community_id).await?;
let community = Community::read(context.pool(), request.community_id).await?;
let deletable = DeletableObjects::Community(community.clone().into());
send_apub_delete_in_community(
local_user_view.person,
@ -253,9 +252,7 @@ async fn send_apub_delete_private_message(
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let recipient_id = pm.recipient_id;
let recipient: ApubPerson = Person::read(context.conn().await?, recipient_id)
.await?
.into();
let recipient: ApubPerson = Person::read(context.pool(), recipient_id).await?.into();
let deletable = DeletableObjects::PrivateMessage(pm.into());
let inbox = vec![recipient.shared_inbox_or_inbox()];
@ -391,7 +388,7 @@ async fn receive_delete_action(
}
Community::update(
context.conn().await?,
context.pool(),
community.id,
&CommunityUpdateForm::builder()
.deleted(Some(deleted))
@ -402,7 +399,7 @@ async fn receive_delete_action(
DeletableObjects::Post(post) => {
if deleted != post.deleted {
Post::update(
context.conn().await?,
context.pool(),
post.id,
&PostUpdateForm::builder().deleted(Some(deleted)).build(),
)
@ -412,7 +409,7 @@ async fn receive_delete_action(
DeletableObjects::Comment(comment) => {
if deleted != comment.deleted {
Comment::update(
context.conn().await?,
context.pool(),
comment.id,
&CommentUpdateForm::builder().deleted(Some(deleted)).build(),
)
@ -421,7 +418,7 @@ async fn receive_delete_action(
}
DeletableObjects::PrivateMessage(pm) => {
PrivateMessage::update(
context.conn().await?,
context.pool(),
pm.id,
&PrivateMessageUpdateForm::builder()
.deleted(Some(deleted))

12
crates/apub/src/activities/deletion/undo_delete.rs
View File

@ -111,9 +111,9 @@ impl UndoDelete {
reason: None,
expires: None,
};
ModRemoveCommunity::create(context.conn().await?, &form).await?;
ModRemoveCommunity::create(context.pool(), &form).await?;
Community::update(
context.conn().await?,
context.pool(),
community.id,
&CommunityUpdateForm::builder().removed(Some(false)).build(),
)
@ -126,9 +126,9 @@ impl UndoDelete {
removed: Some(false),
reason: None,
};
ModRemovePost::create(context.conn().await?, &form).await?;
ModRemovePost::create(context.pool(), &form).await?;
Post::update(
context.conn().await?,
context.pool(),
post.id,
&PostUpdateForm::builder().removed(Some(false)).build(),
)
@ -141,9 +141,9 @@ impl UndoDelete {
removed: Some(false),
reason: None,
};
ModRemoveComment::create(context.conn().await?, &form).await?;
ModRemoveComment::create(context.pool(), &form).await?;
Comment::update(
context.conn().await?,
context.pool(),
comment.id,
&CommentUpdateForm::builder().removed(Some(false)).build(),
)

2
crates/apub/src/activities/following/accept.rs
View File

@ -66,7 +66,7 @@ impl ActivityHandler for AcceptFollow {
// This will throw an error if no follow was requested
let community_id = community.id;
let person_id = person.id;
CommunityFollower::follow_accepted(context.conn().await?, community_id, person_id).await?;
CommunityFollower::follow_accepted(context.pool(), community_id, person_id).await?;
Ok(())
}

8
crates/apub/src/activities/following/follow.rs
View File

@ -65,7 +65,7 @@ impl Follow {
person_id: actor.id,
pending: true,
};
CommunityFollower::follow(context.conn().await?, &community_follower_form)
CommunityFollower::follow(context.pool(), &community_follower_form)
.await
.ok();
@ -113,7 +113,7 @@ impl ActivityHandler for Follow {
follower_id: actor.id,
pending: false,
};
PersonFollower::follow(context.conn().await?, &form).await?;
PersonFollower::follow(context.pool(), &form).await?;
}
UserOrCommunity::Community(c) => {
let form = CommunityFollowerForm {
@ -121,7 +121,7 @@ impl ActivityHandler for Follow {
person_id: actor.id,
pending: false,
};
CommunityFollower::follow(context.conn().await?, &form).await?;
CommunityFollower::follow(context.pool(), &form).await?;
}
}
@ -139,7 +139,7 @@ impl SendActivity for BlockCommunity {
context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
let community = Community::read(context.conn().await?, request.community_id).await?;
let community = Community::read(context.pool(), request.community_id).await?;
UndoFollow::send(&local_user_view.person.into(), &community.into(), context).await
}
}

Some files were not shown because too many files have changed in this diff Show More