Fix admin notification for new user registration (fixes #4916) (#4925)

This commit is contained in:
Nutomic 2024-07-30 14:34:17 +02:00 committed by GitHub
parent 7321a63005
commit fb911679d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -5,12 +5,9 @@ use lemmy_api_common::{
utils::send_new_applicant_email_to_admins, utils::send_new_applicant_email_to_admins,
SuccessResponse, SuccessResponse,
}; };
use lemmy_db_schema::{ use lemmy_db_schema::source::{
source::{ email_verification::EmailVerification,
email_verification::EmailVerification, local_user::{LocalUser, LocalUserUpdateForm},
local_user::{LocalUser, LocalUserUpdateForm},
},
RegistrationMode,
}; };
use lemmy_db_views::structs::{LocalUserView, SiteView}; use lemmy_db_views::structs::{LocalUserView, SiteView};
use lemmy_utils::error::{LemmyErrorType, LemmyResult}; use lemmy_utils::error::{LemmyErrorType, LemmyResult};
@ -41,9 +38,7 @@ pub async fn verify_email(
EmailVerification::delete_old_tokens_for_local_user(&mut context.pool(), local_user_id).await?; EmailVerification::delete_old_tokens_for_local_user(&mut context.pool(), local_user_id).await?;
// send out notification about registration application to admins if enabled // send out notification about registration application to admins if enabled
if site_view.local_site.registration_mode == RegistrationMode::RequireApplication if site_view.local_site.application_email_admins {
&& site_view.local_site.application_email_admins
{
let local_user = LocalUserView::read(&mut context.pool(), local_user_id) let local_user = LocalUserView::read(&mut context.pool(), local_user_id)
.await? .await?
.ok_or(LemmyErrorType::CouldntFindPerson)?; .ok_or(LemmyErrorType::CouldntFindPerson)?;