From dfd1b57a61c321676f05cfe90a5c365fe4655fa1 Mon Sep 17 00:00:00 2001 From: rf Date: Sat, 24 Sep 2022 12:27:10 -0500 Subject: [PATCH] fixup html, add rss feed --- insert-posts.sh | 2 ++ rawleydotxyz.ml | 4 ++- render/render.ml | 81 +++++++++++++++++++++++++++++++++++++---------- render/render.mli | 2 ++ 4 files changed, 71 insertions(+), 18 deletions(-) diff --git a/insert-posts.sh b/insert-posts.sh index 1855b54..71d3f70 100755 --- a/insert-posts.sh +++ b/insert-posts.sh @@ -66,6 +66,8 @@ for file in $(ls "$BLOG_DIR/posts"); do slug=$(sed -n '2p' $target_file | tr -d '\n') title=$(sed -n '3p' $target_file | tr -d '\n') content=$(sed -n '4,$p' $target_file | tr -d '\n') + # Cool little sed to escape html + content=$(sed 's/&/\&/g; s//\>/g; s/"/\"/g; s/'"'"'/\'/g' "$content") insert_post "$date" "$slug" "$title" "$content" done diff --git a/rawleydotxyz.ml b/rawleydotxyz.ml index d9bebc7..392be5d 100644 --- a/rawleydotxyz.ml +++ b/rawleydotxyz.ml @@ -21,7 +21,9 @@ let () = Dream.get "/philosophy" @@ Dream.from_filesystem "html" "philosophy.html"; Dream.get "/web-ring" @@ Dream.from_filesystem "html" "web-ring.html"; Dream.get "/blog" Render.render_blog_index; - Dream.scope "/blog" [Dream.origin_referrer_check] [ + Dream.scope "/blog" [] [ + Dream.get "/rss.xml" Render.render_rss_feed; Dream.get "/:post" Render.render_blog_post ]; + Dream.get "/**" (fun _ -> Render.handle_not_found ()) ] diff --git a/render/render.ml b/render/render.ml index 01c1ce3..1d958a4 100644 --- a/render/render.ml +++ b/render/render.ml @@ -2,18 +2,15 @@ open Database open Lwt module Render = struct - let not_found_template = "404 Not found" - let error_template = "500 Server Error" - let header_template = - {eos| - + {eos| rawley.xyz + @@ -36,12 +33,10 @@ module Render = struct -
- |eos} +
|eos} let footer_template = - {eos| -
+ {eos|
- - |eos} + |eos} + + let not_found_template = + Printf.sprintf "%s %s %s" + header_template + "

404 Not found

" + footer_template + + let error_template = + Printf.sprintf "%s %s %s" + header_template + "

500 Server Error

" + footer_template let render_page content = Printf.sprintf @@ -69,16 +75,27 @@ module Render = struct let generate_link (p : BlogPost.t) = Printf.sprintf - {eos| -
+ {eos|
%s %s -
- |eos} + |eos} p.slug p.title p.date + + let generate_rss_item (p : BlogPost.t) = + Printf.sprintf + {eos| + %s + https://rawley.xyz/blog/%s + + |eos} + p.title p.slug let handle_error e = - print_endline (Caqti_error.show e); error_template |> Dream.html + print_endline (Caqti_error.show e); + Dream.html ?code:(Some 500) error_template + + let handle_not_found () = + Dream.html ?code:(Some 404) not_found_template let render_blog_post request = let slug = Dream.param request "post" in @@ -88,7 +105,7 @@ module Render = struct | Error e -> handle_error e | Ok p_opt -> match p_opt with - | None -> not_found_template |> Dream.html + | None -> handle_not_found () | Some p -> Printf.sprintf "

%s

\r\n%s" p.title p.content |> render_page @@ -106,4 +123,34 @@ module Render = struct render_page @@ Buffer.contents buff else render_page "
No blog posts..." in Dream.html c + + let render_rss_feed (_ : Dream.request) = + let buff = Buffer.create 512 in + let add_str = Buffer.add_string buff in + let () = + add_str + {eos| + + + rawley.xyz blog + Functional programming, math, and philosophy + + https://rawley.xyz/static/rawley.xyz.png + https://rawley.xyz/ + |eos} + in + let posts_t = Database.get_all_blog_posts () in + posts_t >>= function + | Error e -> handle_error e + | Ok posts -> + let () = List.iter (fun t -> generate_rss_item t |> add_str) posts in + let () = + add_str + {eos| + |eos} + in + Lwt.return @@ + Dream.response + ~headers:["Content-Type", "text/xml";] + (Buffer.contents buff) end diff --git a/render/render.mli b/render/render.mli index 7eb09cb..2e26d02 100644 --- a/render/render.mli +++ b/render/render.mli @@ -9,6 +9,8 @@ module Render : val render_page : string -> string val generate_link : BlogPost.t -> string val handle_error : [< Caqti_error.t ] -> Dream.response Lwt.t + val handle_not_found : unit -> Dream.response Lwt.t val render_blog_post : Dream.request -> Dream.response Lwt.t val render_blog_index : Dream.request -> Dream.response Lwt.t + val render_rss_feed : Dream.request -> Dream.response Lwt.t end