image upload alpha 0.0.0.0.1

Cargo.toml

@@ -12,3 +12,6 @@ jsonwebtoken = "=7.2"
 time = "0.3"
 tracing = "0.1"
 tracing-subscriber = "0.3"
+uuid = { version = "0.8", features = ["v4"] }
+futures = { version = "0.3", default-features = false }
+bytes = "1.0"

deploy.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+mkdir -p ./media/profile-pictures
+mkdir -p ./media/images
 touch SECRET
 ./setup-db.sh
 ./build.sh

setup.sql

@@ -2,7 +2,9 @@ DROP TABLE IF EXISTS posts;
 DROP TABLE IF EXISTS users;
 DROP TABLE IF EXISTS posts_tags;
 DROP TABLE IF EXISTS tags;
-DROP TABLE IF EXISTS likes    ;
+DROP TABLE IF EXISTS likes;
+DROP TABLE IF EXISTS images;
+DROP TABLE IF EXISTS posts_images;
 
 CREATE TABLE posts(
 	post_id INTEGER PRIMARY KEY NOT NULL,
@@ -38,12 +40,11 @@ CREATE TABLE likes(
 
 CREATE TABLE posts_images(
 	post_id INTEGER NOT NULL,
-	image_id INTEGER NOT NULL
+	image_uuid VARCHAR(34) NOT NULL
 );
 
 CREATE TABLE images(
-	image_id INTEGER NOT NULL,
-	image_file TEXT NOT NULL
+	image_uuid VARCHAR(34) NOT NULL
 );
 
 --   ----------------                                           -----------          ----------------            ____________

src/api_calls.rs

@@ -2,9 +2,11 @@ use std::collections::HashMap;
 
 use jsonwebtoken::TokenData;
 use tokio_rusqlite::params;
-use tracing::info;
+use tracing::{error, info};
+use warp::filters::multipart::FormData;
 use warp::Filter;
-
+use bytes::BufMut;
+use futures::{StreamExt, TryStreamExt};
 use crate::get_token::get_token;
 use crate::verify_token::{self, Claims};
 use crate::types::*;
@@ -655,6 +657,50 @@ pub async fn change_display_name(request: DisplayNameChangeRequest) -> Result<im
     }
 }
 
+pub async fn upload_image(form: FormData) -> Result<impl warp::Reply, warp::Rejection> {
+    let mut parts = form.into_stream();
+    while let Some(Ok(p)) = parts.next().await {
+        if p.name() == "file" {
+            let content_type = p.content_type();
+            let file_ending;
+            match content_type {
+                Some(file_type) => match file_type {
+                    "image/png" => {
+                        file_ending = "png";
+                    }
+                    v => {
+                        error!("invalid file type found: {}", v);
+                        return Err(warp::reject::reject());
+                    }
+                },
+                None => {
+                    error!("file type could not be determined");
+                    return Err(warp::reject::reject());
+                }
+            }
+            let value = p
+                .stream()
+                .try_fold(Vec::new(), |mut vec, data| {
+                    vec.put(data);
+                    async move { Ok(vec) }
+                })
+                .await
+                .map_err(|e| {
+                    error!("reading file error: {}", e);
+                    warp::reject::reject()
+                })?;
+            let image_uuid = uuid::Uuid::new_v4().to_string();
+            let file_name = format!("./media/images/{}.{}", image_uuid, file_ending);
+            tokio::fs::write(&file_name, value).await.map_err(|e| {
+                error!("error writing file: {}", e);
+                warp::reject::reject()
+            })?;
+            info!("created file: {}", file_name);
+        }
+    }
+    Ok("success")
+}
+
 pub fn post_json() -> impl Filter<Extract = (PostCreateRequest,), Error = warp::Rejection> + Clone {
     warp::body::content_length_limit(1024 * 16).and(warp::body::json())
 }

src/main.rs

@@ -180,6 +180,14 @@ pub fn routes() -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejecti
         .and(display_name_change_json())
         .and_then(change_display_name);
 
+    let upload_image = warp::post()
+        .and(warp::path("api"))
+        .and(warp::path("post"))
+        .and(warp::path("upload"))
+        .and(warp::path("image"))
+        .and(warp::multipart::form().max_length(25000000))
+        .and_then(upload_image);
+
     get_posts_by_user
         .or(post)
         .or(get_posts)
@@ -198,6 +206,7 @@ pub fn routes() -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejecti
         .or(get_profile_by_id)
         .or(get_profile_picture)
         .or(change_display_name)
+        .or(upload_image)
         // .or(get_posts_from_search)
         // .or(get_users_from_search)
 }
@@ -208,5 +217,4 @@ async fn main() {
     let cors = warp::cors().allow_any_origin();
     let routes = routes().with(cors);
     warp::serve(routes).run(([127, 0, 0, 1], 8000)).await;
-
 }

src/types.rs

@@ -34,8 +34,8 @@ pub struct TagList {
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct ReactionCountMap {
-    pub reaction_count_map: HashMap<i64, i64>
+pub struct LikeCountMap {
+    pub like_count_map: HashMap<i64, i64>
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
@@ -60,7 +60,7 @@ pub struct PostCreateRequest {
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct ReactRequest {
     pub post_id: i64,
-    pub reaction_type: i64,
+    pub like_type: i64,
     pub token: String
 }
 

upload-image.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+path="$1/api/post/upload/image"
+
+curl --location --request POST "$path" \
+--header 'Content-Type: multipart/form-data' \
+--form "file=@$2"