Merge branch 'fix/add-check-to-create-site-endpoint' of https://github.com/eiknat...

diff --git a/src/api/site.rs b/src/api/site.rs
index e0e2b6ff8565709f5ee2341945ddc0cbb0428bdf..285c575690b6a29e2289d347df17bb6e63260f31 100644 (file)
--- a/src/api/site.rs
+++ b/src/api/site.rs
@@ -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;