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

small fix

Browse source
This commit is contained in:
Swrup 2022-02-20 01:58:33 +01:00
parent 8df8cef749
commit 8b67fcbc50
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/babillard.ml
View file

@ -449,9 +449,7 @@ let get_post id =
in in
Ok reply Ok reply
let thread_exists id = let thread_exists id = Result.is_ok (Db.find Q.get_is_thread id)
match Db.find Q.get_is_thread id with Error _ -> false | Ok _ -> true
(* true if post is an op too *) (* true if post is an op too *)
let post_exists id = let post_exists id = Result.is_ok (Db.find Q.get_is_post id)
match Db.find Q.get_is_post id with Error _ -> false | Ok _ -> true

15
src/permap.ml
View file

@ -111,7 +111,7 @@ let avatar_image request =
Dream.respond ~headers:[ ("Content-Type", "image") ] avatar Dream.respond ~headers:[ ("Content-Type", "image") ] avatar
| Ok None | Error _ -> ( | Ok None | Error _ -> (
match Content.read "/assets/img/default_avatar.png" with match Content.read "/assets/img/default_avatar.png" with
| None -> Dream.empty `Not_Found | None -> failwith "can't find default avatar"
| Some avatar -> | Some avatar ->
Dream.respond ~headers:[ ("Content-Type", "image") ] avatar ) Dream.respond ~headers:[ ("Content-Type", "image") ] avatar )
else Dream.respond ~status:`Not_Found "404: User does not exists" else Dream.respond ~status:`Not_Found "404: User does not exists"
@ -178,10 +178,12 @@ let thread_get request =
let thread_id = Dream.param request "thread_id" in let thread_id = Dream.param request "thread_id" in
if Babillard.thread_exists thread_id then if Babillard.thread_exists thread_id then
let thread_view = Pp_babillard.view_thread thread_id in let thread_view = Pp_babillard.view_thread thread_id in
match thread_view with let res =
| Error e -> render_unsafe e request match thread_view with
| Ok thread_view -> | Error e -> e
render_unsafe (Thread_page.f thread_view thread_id request) request | Ok thread_view -> Thread_page.f thread_view thread_id request
in
render_unsafe res request
else Dream.respond ~status:`Not_Found "404: Thread not found" else Dream.respond ~status:`Not_Found "404: Thread not found"
(*form to reply to a thread *) (*form to reply to a thread *)
@ -246,9 +248,6 @@ let routes =
[ get_ "/register" register_get; post "/register" register_post ] [ get_ "/register" register_get; post "/register" register_post ]
else [] else []
let not_found _ =
Dream.respond ~status:`Not_Found "404: This page does not exists!"
let () = let () =
let logger = if App.log then Dream.logger else Fun.id in let logger = if App.log then Dream.logger else Fun.id in
Dream.run ~port:App.port @@ logger @@ Dream.cookie_sessions Dream.run ~port:App.port @@ logger @@ Dream.cookie_sessions

3
src/user.ml
View file

@ -169,5 +169,4 @@ let upload_avatar files nick =
Ok () Ok ()
| _files -> Error "More than one file provided" | _files -> Error "More than one file provided"
let exists nick = let exists nick = Result.is_ok (Db.find_opt Q.get_user nick)
match Db.find_opt Q.get_user nick with Error _ -> false | Ok _ -> true