src/api/v1/me/friends/mod.rs

@@ -1,3 +1,4 @@
+use ::uuid::Uuid;
 use actix_web::{HttpRequest, HttpResponse, get, post, web};
 use serde::Deserialize;
 
@@ -8,7 +9,7 @@ use crate::{
     api::v1::auth::check_access_token,
     error::Error,
     objects::Me,
-    utils::{get_auth_header, global_checks, user_uuid_from_username}
+    utils::{get_auth_header, global_checks},
 };
 
 /// Returns a list of users that are your friends
@@ -33,7 +34,7 @@ pub async fn get(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
 
 #[derive(Deserialize)]
 struct UserReq {
-    username: String,
+    uuid: Uuid,
 }
 
 /// `POST /api/v1/me/friends` Send friend request
@@ -73,8 +74,7 @@ pub async fn post(
 
     let me = Me::get(&mut conn, uuid).await?;
 
-    let target_uuid = user_uuid_from_username(&mut conn, &json.username).await?;
-    me.add_friend(&mut conn, target_uuid).await?;
+    me.add_friend(&mut conn, json.uuid).await?;
 
     Ok(HttpResponse::Ok().finish())
 }

src/utils.rs

@@ -168,26 +168,6 @@ pub async fn user_uuid_from_identifier(
     }
 }
 
-pub async fn user_uuid_from_username(
-    conn: &mut Conn,
-    username: &String,
-) -> Result<Uuid, Error> {
-    if USERNAME_REGEX.is_match(username) {
-        use users::dsl;
-        let user_uuid = dsl::users
-            .filter(dsl::username.eq(username))
-            .select(dsl::uuid)
-            .get_result(conn)
-            .await?;
-
-        Ok(user_uuid)
-    } else {
-        Err(Error::BadRequest(
-            "Please provide a valid username".to_string(),
-        ))
-    }
-}
-
 pub async fn global_checks(data: &Data, user_uuid: Uuid) -> Result<(), Error> {
     if data.config.instance.require_email_verification {
         let mut conn = data.pool.get().await?;