~op_or_reply_data :^)

src/babillard.ml

@@ -20,6 +20,12 @@ type post =
   ; citations : string list
   }
 
+type image =
+  { name : string
+  ; alt : string
+  ; content : string
+  }
+
 type t =
   | Op of thread_data * post
   | Post of post
@@ -236,20 +242,18 @@ let () =
       (Array.map (fun query -> Db.exec query ()) tables)
   then Dream.error (fun log -> log "can't create babillard's tables")
 
-let parse_image image =
+let clean_image image =
-  match image with
+  let name, alt, content = image in
-  | None -> Ok None
+  let name =
-  | Some ((name, alt), content) ->
+    match name with
-    let name =
+    | Some name -> Dream.html_escape name
-      match name with
+    | None ->
-      | Some name -> Dream.html_escape name
+      (* make up random name if no name was given *)
-      | None ->
+      Uuidm.to_string (Uuidm.v4_gen random_state ())
-        (* make up random name if no name was given *)
+  in
-        Uuidm.to_string (Uuidm.v4_gen random_state ())
+  if not (is_valid_image content) then Error "invalid image"
-    in
+  else if String.length alt > 1000 then Error "Image description too long"
-    if not (is_valid_image content) then Error "invalid image"
+  else Ok (name, alt, content)
-    else if String.length alt > 1000 then Error "Image description too long"
-    else Ok (Some ((name, alt), content))
 
 (*TODO switch to markdown !*)
 (* insert html into the comment, and keep tracks of citations :
@@ -304,7 +308,7 @@ let parse_comment comment =
   let citations = List.sort_uniq String.compare !citations in
   (comment, citations)
 
-let upload_post ?image_content post =
+let upload_post ~image post =
   let thread_data, reply =
     match post with
     | Op (thread_data, reply) -> (Some thread_data, reply)
@@ -319,15 +323,14 @@ let upload_post ?image_content post =
   let^ () = Db.exec Q.upload_post_comment (id, comment) in
   let^ () = Db.exec Q.upload_post_date (id, date) in
   let^ () = Db.exec Q.upload_thread_post (parent_id, id) in
-  let _res_image_info, _res_image_content =
+  let* () =
-    match image_info with
+    match image with
-    | None -> (Ok (), Ok ())
+    | None -> Ok ()
-    | Some (name, alt) -> (
+    | Some image ->
-      match image_content with
+      assert (Option.is_some image_info);
-      | None -> failwith "No image_content for a post with image"
+      let^ () = Db.exec Q.upload_image_info (id, image.name, image.alt) in
-      | Some content ->
+      let^ () = Db.exec Q.upload_image_content (id, image.content) in
-        ( Db.exec Q.upload_image_info (id, name, alt)
+      Ok ()
-        , Db.exec Q.upload_image_content (id, content) ) )
   in
   let^ _unit_list =
     unwrap_list (fun tag -> Db.exec Q.upload_post_tag (id, tag)) tags
@@ -343,52 +346,44 @@ let upload_post ?image_content post =
     let^ () = Db.exec Q.upload_thread_info (id, subject, lat, lng) in
     Ok id
 
-let build_reply ~comment ?image ~tag_list ?parent_id user_id =
+let build_reply ~comment ~image_info ~tag_list ?parent_id user_id =
   let comment = Dream.html_escape comment in
   let id = Uuidm.to_string (Uuidm.v4_gen random_state ()) in
   (* parent_id is None if this reply is supposed to be a new thread *)
   let parent_id = Option.value parent_id ~default:id in
   if Option.is_none (Uuidm.of_string parent_id) then Error "invalid thread id"
   else if String.length comment > 10000 then Error "invalid comment"
+  else if List.length tag_list > 30 then Error "too much tags"
+  else if List.exists (fun tag -> String.length tag > 100) tag_list then
+    Error "tag too long"
   else
-    match parse_image image with
+    let tag_list =
-    | Error e -> Error e
+      List.map String.lowercase_ascii
-    | Ok image ->
+      @@ List.sort_uniq String.compare
-      if List.length tag_list > 30 then Error "too much tags"
+      @@ List.filter (( <> ) "")
-      else if List.exists (fun tag -> String.length tag > 100) tag_list then
+      @@ List.map String.trim
-        Error "tag too long"
+      @@ List.map Dream.html_escape tag_list
-      else
+    in
-        let image_info =
+    let date = Unix.time () in
-          match image with
+    let comment, citations = parse_comment comment in
-          | None -> None
+    let* nick = User.get_nick user_id in
-          | Some (image_info, _image_content) -> Some image_info
+    let reply =
-        in
+      { id
-        let tag_list =
+      ; parent_id
-          List.map String.lowercase_ascii
+      ; date
-          @@ List.sort_uniq String.compare
+      ; user_id
-          @@ List.filter (( <> ) "")
+      ; nick
-          @@ List.map String.trim
+      ; comment
-          @@ List.map Dream.html_escape tag_list
+      ; image_info
-        in
+      ; tags = tag_list
-        let date = Unix.time () in
+      ; replies = []
-        let comment, citations = parse_comment comment in
+      ; citations
-        let* nick = User.get_nick user_id in
+      }
-        let reply =
+    in
-          { id
+    Ok reply
-          ; parent_id
-          ; date
-          ; user_id
-          ; nick
-          ; comment
-          ; image_info
-          ; tags = tag_list
-          ; replies = []
-          ; citations
-          }
-        in
-        Ok reply
 
-let build_op ~comment ?image ~tag_list ~categories ~subject ~lat ~lng user_id =
+let build_op ~comment ~image_info ~tag_list ~categories ~subject ~lat ~lng
+    user_id =
   let subject = Dream.html_escape subject in
   if List.exists (fun s -> not (List.mem s App.categories)) categories then
     Error "Invalid category"
@@ -400,30 +395,39 @@ let build_op ~comment ?image ~tag_list ~categories ~subject ~lat ~lng user_id =
     else if String.length subject > 600 then Error "Invalid subject"
     else
       let thread_data = { subject; lng; lat } in
-      let* reply =
+      let* reply = build_reply ~comment ~image_info ~tag_list user_id in
-        match image with
+      let op = (thread_data, reply) in
-        | Some image -> build_reply ~comment ~image ~tag_list user_id
-        | None -> build_reply ~comment ~tag_list user_id
-      in
-      let op = Op (thread_data, reply) in
       Ok op
 
-let make_reply ~comment ?image ~tags ~parent_id user_id =
+let build_image image_input =
-  let tag_list = Str.split (Str.regexp ",+") tags in
+  let* name, alt, content = clean_image image_input in
-  let* reply = build_reply ~comment ?image ~tag_list ~parent_id user_id in
+  let image = { name; alt; content } in
-  let post = Post reply in
+  Ok image
-  match image with
-  | None -> upload_post post
-  | Some (_image_info, image_content) -> upload_post ~image_content post
 
-let make_op ~comment ?image ~tags ~categories ~subject ~lat ~lng user_id =
+let make_post ~comment ?image_input ~tags ~op_or_reply_data user_id =
-  let tag_list = Str.split (Str.regexp ",+") tags in
+  let tag_list = String.split_on_char ',' tags in
-  let* op =
+  let* image, image_info =
-    build_op ~comment ?image ~tag_list ~categories ~subject ~lat ~lng user_id
+    match image_input with
+    | None -> Ok (None, None)
+    | Some image_input ->
+      let* image = build_image image_input in
+      Ok (Some image, Some (image.name, image.alt))
   in
-  match image with
+  let* post =
-  | None -> upload_post op
+    match op_or_reply_data with
-  | Some (_image_info, image_content) -> upload_post ~image_content op
+    | `Reply_data parent_id ->
+      let* reply =
+        build_reply ~comment ~image_info ~tag_list ~parent_id user_id
+      in
+      Ok (Post reply)
+    | `Op_data (categories, subject, lat, lng) ->
+      let* thread_data, reply =
+        build_op ~comment ~image_info ~tag_list ~categories ~subject ~lat ~lng
+          user_id
+      in
+      Ok (Op (thread_data, reply))
+  in
+  upload_post ~image post
 
 let get_post_image_content id =
   let^? content = Db.find_opt Q.get_post_image_content id in

src/permap.ml

@@ -373,16 +373,15 @@ let babillard_post request =
       | None, _ -> render_unsafe "Invalide coordinate" request
       | _, None -> render_unsafe "Invalide coordinate" request
       | Some lat, Some lng -> (
+        let op_or_reply_data = `Op_data (categories, subject, lat, lng) in
         let res =
           match file with
-          | [] ->
+          | [] -> Babillard.make_post ~comment ~tags ~op_or_reply_data user_id
-            Babillard.make_op ~comment ~lat ~lng ~subject ~tags ~categories
-              user_id
           | _ :: _ :: _ -> Error "More than one image"
           | [ (image_name, image_content) ] ->
-            let image = ((image_name, alt), image_content) in
+            let image_input = (image_name, alt, image_content) in
-            Babillard.make_op ~comment ~image ~lat ~lng ~subject ~tags
+            Babillard.make_post ~comment ~image_input ~tags ~op_or_reply_data
-              ~categories user_id
+              user_id
         in
         match res with
         | Ok thread_id ->
@@ -430,12 +429,14 @@ let reply_post request =
         ; ("reply-comment", [ (_, comment) ])
         ; ("tags", [ (_, tags) ])
         ] -> (
+      let op_or_reply_data = `Reply_data parent_id in
       let res =
         match file with
-        | [] -> Babillard.make_reply ~comment ~tags ~parent_id user_id
+        | [] -> Babillard.make_post ~comment ~tags ~op_or_reply_data user_id
         | [ (image_name, image_content) ] ->
-          let image = ((image_name, alt), image_content) in
+          let image_input = (image_name, alt, image_content) in
-          Babillard.make_reply ~comment ~image ~tags ~parent_id user_id
+          Babillard.make_post ~comment ~image_input ~tags ~op_or_reply_data
+            user_id
         | _ :: _ :: _ -> Error "More than one image"
       in
       match res with