use actix_web::web::Data;
use lemmy_api_common::{blocking, honeypot_check, password_length_check, person::*};
use lemmy_apub::{
- generate_apub_endpoint,
generate_followers_url,
generate_inbox_url,
+ generate_local_apub_endpoint,
generate_shared_inbox_url,
EndpointType,
};
-use lemmy_db_queries::{
- source::{local_user::LocalUser_, site::Site_},
- Crud,
- Followable,
- Joinable,
- ListingType,
- SortType,
-};
use lemmy_db_schema::{
+ newtypes::CommunityId,
source::{
- community::*,
+ community::{
+ Community,
+ CommunityFollower,
+ CommunityFollowerForm,
+ CommunityForm,
+ CommunityModerator,
+ CommunityModeratorForm,
+ },
local_user::{LocalUser, LocalUserForm},
- person::*,
- site::*,
+ person::{Person, PersonForm},
+ site::Site,
},
- CommunityId,
+ traits::{Crud, Followable, Joinable},
+ ListingType,
+ SortType,
};
use lemmy_db_views_actor::person_view::PersonViewSafe;
use lemmy_utils::{
let data: &Register = self;
// Make sure site has open registration
- if let Ok(site) = blocking(context.pool(), move |conn| Site::read_simple(conn)).await? {
+ if let Ok(site) = blocking(context.pool(), Site::read_simple).await? {
if !site.open_registration {
return Err(ApiError::err_plain("registration_closed").into());
}
if !is_valid_actor_name(&data.username, context.settings().actor_name_max_length) {
return Err(ApiError::err_plain("invalid_username").into());
}
- let actor_id = generate_apub_endpoint(
+ let actor_id = generate_local_apub_endpoint(
EndpointType::Person,
&data.username,
&context.settings().get_protocol_and_hostname(),
name: data.username.to_owned(),
actor_id: Some(actor_id.clone()),
private_key: Some(Some(actor_keypair.private_key)),
- public_key: Some(Some(actor_keypair.public_key)),
+ public_key: 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),
Ok(c) => c,
Err(_e) => {
let default_community_name = "main";
- let actor_id = generate_apub_endpoint(
+ let actor_id = generate_local_apub_endpoint(
EndpointType::Community,
default_community_name,
&protocol_and_hostname,
title: "The Default Community".to_string(),
description: Some("The Default Community".to_string()),
actor_id: Some(actor_id.to_owned()),
- private_key: Some(main_community_keypair.private_key),
- public_key: Some(main_community_keypair.public_key),
+ 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)?)),