swrup/geochan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change /post_pic for /img , add get_post

Browse source
This commit is contained in:
Swrup 2022-02-18 19:58:30 +01:00
parent 0cbaf29676
commit a68e8ea700
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/babillard.ml
View file

@ -29,13 +29,6 @@ module Q = struct
"CREATE TABLE IF NOT EXISTS post_user (post_id TEXT, nick TEXT, PRIMARY \ "CREATE TABLE IF NOT EXISTS post_user (post_id TEXT, nick TEXT, PRIMARY \
KEY(post_id), FOREIGN KEY(nick) REFERENCES user(nick));" KEY(post_id), FOREIGN KEY(nick) REFERENCES user(nick));"
(* post_id -> OP's post_id *)
let create_post_parent_table =
Caqti_request.exec Caqti_type.unit
"CREATE TABLE IF NOT EXISTS post_parent (post_id TEXT, parent_id TEXT, \
FOREIGN KEY(post_id) REFERENCES post_user(post_id),\n\
\ FOREIGN KEY(parent_id) REFERENCES post_user(post_id));"
let create_thread_table = let create_thread_table =
Caqti_request.exec Caqti_type.unit Caqti_request.exec Caqti_type.unit
"CREATE TABLE IF NOT EXISTS threads (thread_id TEXT, post_id TEXT,\n\ "CREATE TABLE IF NOT EXISTS threads (thread_id TEXT, post_id TEXT,\n\
@ -171,7 +164,7 @@ module Q = struct
let get_post_citations = let get_post_citations =
Caqti_request.collect Caqti_type.string Caqti_type.string Caqti_request.collect Caqti_type.string Caqti_type.string
"SELECT post_id FROM post_citations WHERE reply_id=?;" "SELECT post_id FROM post_citations WHERE post_id=?;"
let get_post_replies = let get_post_replies =
Caqti_request.collect Caqti_type.string Caqti_type.string Caqti_request.collect Caqti_type.string Caqti_type.string
@ -185,10 +178,14 @@ module Q = struct
Caqti_request.find Caqti_type.string Caqti_type.int Caqti_request.find Caqti_type.string Caqti_type.int
"SELECT COUNT(post_id) FROM threads WHERE thread_id=?;" "SELECT COUNT(post_id) FROM threads WHERE thread_id=?;"
let get_thread = let get_is_thread =
Caqti_request.find Caqti_type.string Caqti_type.string Caqti_request.find Caqti_type.string Caqti_type.string
"SELECT thread_id FROM threads WHERE thread_id=? LIMIT 1;" "SELECT thread_id FROM threads WHERE thread_id=? LIMIT 1;"
let get_post_thread =
Caqti_request.find Caqti_type.string Caqti_type.string
"SELECT thread_id FROM threads WHERE post_id=? LIMIT 1;"
let get_post_subject = let get_post_subject =
Caqti_request.find_opt Caqti_type.string Caqti_type.string Caqti_request.find_opt Caqti_type.string Caqti_type.string
"SELECT subject FROM post_subject WHERE post_id=?;" "SELECT subject FROM post_subject WHERE post_id=?;"
@ -206,7 +203,6 @@ end
let () = let () =
let tables = let tables =
[ Q.create_post_user_table [ Q.create_post_user_table
; Q.create_post_parent_table
; Q.create_thread_table ; Q.create_thread_table
; Q.create_post_replies_table ; Q.create_post_replies_table
; Q.create_post_citations_table ; Q.create_post_citations_table
@ -430,6 +426,21 @@ let make_op ~comment ?image ~tags ~subject ~lat ~lng nick =
| None -> upload_post op | None -> upload_post op
| Some (_image_info, image_content) -> upload_post ~image_content op | Some (_image_info, image_content) -> upload_post ~image_content op
let get_post_image_content post_id = let get_post_image_content id =
let^? content = Db.find_opt Q.get_post_image_content post_id in let^? content = Db.find_opt Q.get_post_image_content id in
Ok content Ok content
let get_post id =
let^ parent_id = Db.find Q.get_post_thread id in
let^ nick = Db.find Q.get_post_nick id in
let^ comment = Db.find Q.get_post_comment id in
let^ date = Db.find Q.get_post_date id in
let^ image_info = Db.find_opt Q.get_post_image_info id in
let^ tags = Db.collect_list Q.get_post_tags id in
let^ replies = Db.collect_list Q.get_post_replies id in
let^ citations = Db.collect_list Q.get_post_citations id in
let reply =
{ id; parent_id; date; nick; comment; image_info; tags; replies; citations }
in
Ok reply