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

refactor

Browse source
This commit is contained in:
zapashcanon 2022-04-08 00:43:00 +02:00
parent 190d086206
commit ce7bb9d386
No known key found for this signature in database
GPG key ID: 8981C3C62D1D28F1
9 changed files with 442 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/permap.ml
View file

@ -148,12 +148,9 @@ let user request =
let user_profile request =
let nick = Dream.param request "user" in
match User.get_user_id_from_nick nick with
match User.get_id_from_nick nick with
| Error _e -> Dream.respond ~status:`Not_Found "User does not exists"
| Ok user_id ->
render
(Result.fold ~ok:Fun.id ~error:Fun.id (User.public_profile user_id))
request
| Ok user_id -> render_result request @@ User.public_profile user_id
let logout request =
let _ = Dream.invalidate_session request in
@ -260,7 +257,7 @@ let get_post_image ~thumbnail request =
let get_avatar_image request =
let nick = Dream.param request "user" in
match User.get_user_id_from_nick nick with
match User.get_id_from_nick nick with
| Error _e -> Dream.respond ~status:`Not_Found "User does not exists"
| Ok user_id -> (
let avatar = Image.get_user_content user_id in
@ -331,24 +328,19 @@ let babillard_post request =
let thread_feed_get request =
let thread_id = Dream.param request "thread_id" in
if Babillard.thread_exist thread_id then
match Pp_babillard.feed thread_id with
| Error e -> render e request
| Ok feed ->
Dream.respond ~headers:[ ("Content-Type", "application/atom+xml") ] feed
else Dream.respond ~status:`Not_Found "Thread not found"
match Pp_babillard.feed thread_id with
| Error e -> render e request
| Ok feed ->
Dream.respond ~headers:[ ("Content-Type", "application/atom+xml") ] feed
let thread_get request =
let thread_id = Dream.param request "thread_id" in
if Babillard.thread_exist thread_id then
let thread_view = Pp_babillard.view_thread thread_id in
let res =
match thread_view with
| Error e -> e
| Ok thread_view -> Thread_page.f thread_view thread_id request
in
render res request
else Dream.respond ~status:`Not_Found "Thread not found"
let thread_view = Pp_babillard.view_thread thread_id in
render
( match thread_view with
| Error e -> e
| Ok thread_view -> Thread_page.f thread_view thread_id request )
request
(*form to reply to a thread *)
let reply_post request =