use crate::PerformCrud;
+use activitypub_federation::core::signatures::generate_actor_keypair;
use actix_web::web::Data;
use lemmy_api_common::{
- blocking,
- honeypot_check,
- password_length_check,
- person::*,
- send_verification_email,
+ person::{LoginResponse, Register},
+ utils::{
+ blocking,
+ honeypot_check,
+ password_length_check,
+ send_new_applicant_email_to_admins,
+ send_verification_email,
+ },
};
use lemmy_apub::{
- generate_followers_url,
generate_inbox_url,
generate_local_apub_endpoint,
generate_shared_inbox_url,
EndpointType,
};
use lemmy_db_schema::{
- newtypes::CommunityId,
+ aggregates::structs::PersonAggregates,
source::{
- community::{
- Community,
- CommunityFollower,
- CommunityFollowerForm,
- CommunityForm,
- CommunityModerator,
- CommunityModeratorForm,
- },
local_user::{LocalUser, LocalUserForm},
person::{Person, PersonForm},
registration_application::{RegistrationApplication, RegistrationApplicationForm},
site::Site,
},
- traits::{Crud, Followable, Joinable},
+ traits::Crud,
};
-use lemmy_db_views_actor::person_view::PersonViewSafe;
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views_actor::structs::PersonViewSafe;
use lemmy_utils::{
- apub::generate_actor_keypair,
claims::Claims,
- utils::{check_slurs, is_valid_actor_name},
+ error::LemmyError,
+ utils::{check_slurs, check_slurs_opt, is_valid_actor_name},
ConnectionId,
- LemmyError,
};
use lemmy_websocket::{messages::CheckCaptcha, LemmyContext};
let (mut email_verification, mut require_application) = (false, false);
// Make sure site has open registration
- if let Ok(site) = blocking(context.pool(), Site::read_simple).await? {
+ let site = blocking(context.pool(), Site::read_local).await?;
+ if let Ok(site) = &site {
if !site.open_registration {
return Err(LemmyError::from_message("registration_closed"));
}
}
}
- check_slurs(&data.username, &context.settings().slur_regex())?;
+ let slur_regex = &context.settings().slur_regex();
+ check_slurs(&data.username, slur_regex)?;
+ check_slurs_opt(&data.answer, slur_regex)?;
let actor_keypair = generate_actor_keypair()?;
if !is_valid_actor_name(&data.username, context.settings().actor_name_max_length) {
name: data.username.to_owned(),
actor_id: Some(actor_id.clone()),
private_key: Some(Some(actor_keypair.private_key)),
- public_key: actor_keypair.public_key,
+ public_key: Some(actor_keypair.public_key),
inbox_url: Some(generate_inbox_url(&actor_id)?),
shared_inbox_url: Some(Some(generate_shared_inbox_url(&actor_id)?)),
admin: Some(no_admins),
Person::create(conn, &person_form)
})
.await?
- .map_err(LemmyError::from)
- .map_err(|e| e.with_message("user_already_exists"))?;
+ .map_err(|e| LemmyError::from_error_message(e, "user_already_exists"))?;
// Create the local user
let local_user_form = LocalUserForm {
person_id: Some(inserted_person.id),
- email: Some(data.email.as_deref().map(|s| s.to_owned())),
+ email: Some(data.email.as_deref().map(|s| s.to_lowercase())),
password_encrypted: Some(data.password.to_string()),
show_nsfw: Some(data.show_nsfw),
email_verified: Some(false),
})
.await??;
- return Err(LemmyError::from(e).with_message(err_type));
+ return Err(LemmyError::from_error_message(e, err_type));
}
};
.await??;
}
- let main_community_keypair = generate_actor_keypair()?;
-
- // Create the main community if it doesn't exist
- let protocol_and_hostname = context.settings().get_protocol_and_hostname();
- let main_community = match blocking(context.pool(), move |conn| {
- Community::read(conn, CommunityId(2))
- })
- .await?
- {
- Ok(c) => c,
- Err(_e) => {
- let default_community_name = "main";
- let actor_id = generate_local_apub_endpoint(
- EndpointType::Community,
- default_community_name,
- &protocol_and_hostname,
- )?;
- let community_form = CommunityForm {
- name: default_community_name.to_string(),
- title: "The Default Community".to_string(),
- description: Some("The Default Community".to_string()),
- actor_id: Some(actor_id.to_owned()),
- private_key: Some(Some(main_community_keypair.private_key)),
- public_key: main_community_keypair.public_key,
- followers_url: Some(generate_followers_url(&actor_id)?),
- inbox_url: Some(generate_inbox_url(&actor_id)?),
- shared_inbox_url: Some(Some(generate_shared_inbox_url(&actor_id)?)),
- ..CommunityForm::default()
- };
- blocking(context.pool(), move |conn| {
- Community::create(conn, &community_form)
- })
- .await??
- }
- };
-
- // Sign them up for main community no matter what
- let community_follower_form = CommunityFollowerForm {
- community_id: main_community.id,
- person_id: inserted_person.id,
- pending: false,
- };
-
- let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
- blocking(context.pool(), follow)
- .await?
- .map_err(LemmyError::from)
- .map_err(|e| e.with_message("community_follower_already_exists"))?;
-
- // If its an admin, add them as a mod and follower to main
- if no_admins {
- let community_moderator_form = CommunityModeratorForm {
- community_id: main_community.id,
- person_id: inserted_person.id,
- };
-
- let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
- blocking(context.pool(), join)
- .await?
- .map_err(LemmyError::from)
- .map_err(|e| e.with_message("community_moderator_already_exists"))?;
+ // Email the admins
+ if site.map(|s| s.application_email_admins).unwrap_or(false) {
+ send_new_applicant_email_to_admins(&data.username, context.pool(), context.settings())
+ .await?;
}
let mut login_response = LoginResponse {
);
} else {
if email_verification {
- send_verification_email(
- inserted_local_user.id,
- // we check at the beginning of this method that email is set
- &inserted_local_user.email.expect("email was provided"),
- &inserted_person.name,
- context.pool(),
- &context.settings(),
- )
- .await?;
+ let local_user_view = LocalUserView {
+ local_user: inserted_local_user,
+ person: inserted_person,
+ counts: PersonAggregates::default(),
+ };
+ // we check at the beginning of this method that email is set
+ let email = local_user_view
+ .local_user
+ .email
+ .clone()
+ .expect("email was provided");
+ send_verification_email(&local_user_view, &email, context.pool(), context.settings())
+ .await?;
login_response.verify_email_sent = true;
}
projects / lemmy.git / blobdiff