mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-25 15:39:11 +00:00
Merge branch 'fix/add-check-to-create-site-endpoint' of https://github.com/eiknat/lemmy into eiknat-fix/add-check-to-create-site-endpoint
This commit is contained in:
commit
dd93ac49a3
|
@ -142,6 +142,12 @@ impl Perform for CreateSite {
|
|||
) -> Result<SiteResponse, LemmyError> {
|
||||
let data: &CreateSite = &self;
|
||||
|
||||
match blocking(context.pool(), move |conn| { Site::read(conn, 1)}).await?
|
||||
{
|
||||
Ok(_site) => return Err(APIError::err("site_already_exists").into()),
|
||||
Err(_e) => (),
|
||||
};
|
||||
|
||||
let user = get_user_from_jwt(&data.auth, context.pool()).await?;
|
||||
|
||||
check_slurs(&data.name)?;
|
||||
|
@ -490,6 +496,8 @@ impl Perform for TransferSite {
|
|||
let data: &TransferSite = &self;
|
||||
let mut user = get_user_from_jwt(&data.auth, context.pool()).await?;
|
||||
|
||||
is_admin(context.pool(), user.id).await?;
|
||||
|
||||
// TODO add a User_::read_safe() for this.
|
||||
user.password_encrypted = "".to_string();
|
||||
user.private_key = None;
|
||||
|
|
Loading…
Reference in a new issue