Return 404 when user public_key is empty

src/api/core/accounts.rs

@@ -278,16 +278,15 @@ async fn put_avatar(data: JsonUpcase<AvatarData>, headers: Headers, mut conn: Db
 
 #[get("/users/<uuid>/public-key")]
 async fn get_public_keys(uuid: &str, _headers: Headers, mut conn: DbConn) -> JsonResult {
-    let user = match User::find_by_uuid(uuid, &mut conn).await {
-        Some(user) => user,
-        None => err!("User doesn't exist"),
-    };
-
-    Ok(Json(json!({
-        "UserId": user.uuid,
-        "PublicKey": user.public_key,
-        "Object":"userKey"
-    })))
+    match User::find_by_uuid(uuid, &mut conn).await {
+        Some(user) if user.public_key.is_some() => Ok(Json(json!({
+            "UserId": user.uuid,
+            "PublicKey": user.public_key,
+            "Object":"userKey"
+        }))),
+        Some(_) => err_code!("User has no public_key", Status::NotFound.code),
+        None => err_code!("User doesn't exist", Status::NotFound.code),
+    }
 }
 
 #[post("/accounts/keys", data = "<data>")]