search users dziala ale bez pfp :(

src/api_calls.rs

@@ -177,6 +177,58 @@ pub async fn get_posts_from_search(phrase: String, limit: i64, offset: i64) -> R
     ))
 }
 
+pub async fn get_users_from_search(phrase: String, limit: i64, offset: i64) -> Result<impl warp::Reply, warp::Rejection> {
+    let connection = tokio_rusqlite::Connection::open("projekt-db")
+        .await
+        .unwrap();
+
+    let timestamp = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .unwrap()
+        .as_secs() as i64;
+    let phrase_cpy = "%".to_string() + &phrase + "%";
+    let query = format!(
+        "
+        SELECT users.user_id, users.user_name, users.display_name, users.description, images.image_file
+        FROM users 
+        LEFT JOIN images ON images.image_id=users.pfp_id
+        WHERE users.user_name LIKE ?
+        AND users.user_id NOT IN 
+        (SELECT user_id FROM bans WHERE is_active = 1 AND expires_on > {})
+        LIMIT ? OFFSET ?
+    ", // tutaj tez ten left join do wywalenia
+        timestamp
+    );
+    let profile_list = connection
+        .call(move |conn| {
+            let mut statement = conn.prepare(&query).unwrap();
+            let mut rows = statement.query(params![phrase_cpy, limit, offset]).unwrap();
+            let mut profile_vec: Vec<Profile> = Vec::new();
+            while let Ok(Some(row)) = rows.next() {
+                let pfp = match row.get::<_, String>(4) {
+                    Ok(val) => format!("pfp_{}", val),
+                    Err(_) => "".to_string()
+                };
+                profile_vec.push(Profile {
+                    user_id: row.get(0).unwrap(),
+                    user_name: row.get(1).unwrap(),
+                    display_name: row.get(2).unwrap(),
+                    description: row.get(3).unwrap(),
+                    pfp_image: pfp,
+                });
+            }
+            Ok(profile_vec)
+        })
+        .await
+        .unwrap();
+
+    let post = ProfileList { profile_list };
+    Ok(warp::reply::with_status(
+        warp::reply::json(&post),
+        warp::http::StatusCode::OK,
+    ))
+}
+
 pub async fn get_posts(limit: i64, offset: i64) -> Result<impl warp::Reply, warp::Rejection> {
     let connection = tokio_rusqlite::Connection::open("projekt-db")
         .await
@@ -436,9 +488,9 @@ pub async fn get_profile_by_id(user_id: i64) -> Result<impl warp::Reply, warp::R
                users.display_name, users.description,
                images.image_file
         FROM users 
-        JOIN images ON images.image_id=users.pfp_id
+        LEFT JOIN images ON images.image_id=users.pfp_id
         WHERE users.user_id = ?
-    ";
+    "; // na razie jest left join zeby zwracalo cokolwiek, do naprawienia
 
     if !check_user_id(&connection, user_id).await {
         let r = "User not found";

src/main.rs

@@ -1,3 +1,4 @@
+#![recursion_limit = "256"]
 use warp::Filter;
 pub mod auth;
 pub mod api_calls;
@@ -64,9 +65,9 @@ pub fn routes() -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejecti
         .and(warp::path!("api" / "get" / "posts" / "from-search" / String / i64 / i64))
         .and_then(get_posts_from_search);
 
-    // let get_users_from_search = warp::get()
-    //     .and(warp::path("api" / "get" / "users" / "from-search" / String))
-    //     .and_then(get_posts_from_search);
+    let get_users_from_search = warp::get()
+        .and(warp::path!("api" / "get" / "users" / "from-search" / String / i64 / i64))
+        .and_then(get_users_from_search);
 
     let post = warp::post()
         .and(warp::path!("api" / "post" / "add-post"))
@@ -198,7 +199,7 @@ pub fn routes() -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejecti
         .or(comment)
         .or(get_comments_from_post)
         .or(get_posts_from_search)
-        // .or(get_users_from_search)
+        .or(get_users_from_search)
 }
 
 #[tokio::main]

src/types.rs

@@ -43,7 +43,7 @@ pub struct PostList {
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct ProfileList {
-    pub post_list: Vec<Profile>
+    pub profile_list: Vec<Profile>
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]