From 70e36cd88795e763dc3388f6715188bddd274d83 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Thu, 7 Mar 2024 09:30:21 -0600 Subject: [PATCH] chore: Format code --- .formatter.exs | 3 +- config/config.exs | 3 +- lib/mix/tasks/pre_dot_hn/ping.ex | 4 +-- lib/pre_dot_hn.ex | 52 ++++++++++++++++++-------------- lib/pre_dot_hn/link_log.ex | 43 ++++++++++++++------------ lib/pre_dot_hn/markdown.ex | 1 - 6 files changed, 56 insertions(+), 50 deletions(-) diff --git a/.formatter.exs b/.formatter.exs index 32c4daa..b1b3ec2 100644 --- a/.formatter.exs +++ b/.formatter.exs @@ -1,6 +1,5 @@ # Used by "mix format" [ import_deps: [:phoenix_live_view], - inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"], - locals_without_parens: [config: ] + inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] ] diff --git a/config/config.exs b/config/config.exs index ad4220a..28c4ee9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -14,8 +14,7 @@ config :tailwind, config :esbuild, version: "0.19.3", default: [ - args: - ~w(js/app.js --bundle --target=es2016 --outdir=../priv/static/assets/), + args: ~w(js/app.js --bundle --target=es2016 --outdir=../priv/static/assets/), cd: Path.expand("../assets", __DIR__), env: %{"NODE_PATH" => Path.expand("../deps", __DIR__)} ], diff --git a/lib/mix/tasks/pre_dot_hn/ping.ex b/lib/mix/tasks/pre_dot_hn/ping.ex index d672ee5..5acf260 100644 --- a/lib/mix/tasks/pre_dot_hn/ping.ex +++ b/lib/mix/tasks/pre_dot_hn/ping.ex @@ -1,7 +1,7 @@ defmodule Mix.Tasks.PreDotHn.Ping do use Mix.Task - @urls [ + @urls [ "http://google.com/ping?sitemap=%s", "http://www.bing.com/webmaster/ping.aspx?sitemap=%s" ] @@ -10,7 +10,7 @@ defmodule Mix.Tasks.PreDotHn.Ping do @urls |> Enum.map(fn url -> ping_url = String.replace(url, "%s", sitemap_url) - :httpc.request('#{ping_url}') + :httpc.request(~c"#{ping_url}") end) end diff --git a/lib/pre_dot_hn.ex b/lib/pre_dot_hn.ex index b7981c9..83089b7 100644 --- a/lib/pre_dot_hn.ex +++ b/lib/pre_dot_hn.ex @@ -99,29 +99,33 @@ defmodule PreDotHn do assigns = %{base: base, posts: posts} body = - EEx.eval_string(""" - - - - pre.hn - Robert Prehn's personal blog. - https://pre.hn - - + EEx.eval_string( + """ + + + + pre.hn + Robert Prehn's personal blog. + https://pre.hn + + - <%= for post <- @posts do %> - - <%= HtmlSanitizeEx.strip_tags(post.title) %> - - <%= Phoenix.HTML.html_escape(post.body) |> elem(1) %> - - <%= rss_date_format.(post.date) %> - <%= @base %><%= post.slug %>/ - - <% end %> - - - """, assigns: assigns, rss_date_format: &rss_date_format/1) + <%= for post <- @posts do %> + + <%= HtmlSanitizeEx.strip_tags(post.title) %> + + <%= Phoenix.HTML.html_escape(post.body) |> elem(1) %> + + <%= rss_date_format.(post.date) %> + <%= @base %><%= post.slug %>/ + + <% end %> + + + """, + assigns: assigns, + rss_date_format: &rss_date_format/1 + ) path = Path.join(["priv", "static", "feed.rss"]) @@ -162,7 +166,9 @@ defmodule PreDotHn do def make_sitemap(posts) do posts - |> Stream.map(&(%Sitemapper.URL{lastmod: (&1[:updated_at] || &1.date), loc: "https://pre.hn/#{&1.slug}/"})) + |> Stream.map( + &%Sitemapper.URL{lastmod: &1[:updated_at] || &1.date, loc: "https://pre.hn/#{&1.slug}/"} + ) |> Sitemapper.generate(sitemap_url: "https://pre.hn/") |> Sitemapper.persist(store: Sitemapper.FileStore, store_config: [path: "priv/static/"]) |> Stream.run() diff --git a/lib/pre_dot_hn/link_log.ex b/lib/pre_dot_hn/link_log.ex index bdddf07..95ed2f5 100644 --- a/lib/pre_dot_hn/link_log.ex +++ b/lib/pre_dot_hn/link_log.ex @@ -24,27 +24,30 @@ defmodule PreDotHn.LinkLog do assigns = %{links: links} body = - EEx.eval_string(""" - - - - pre.hn - Links - Robert Prehn's Link Log - https://pre.hn - + EEx.eval_string( + """ + + + + pre.hn - Links + Robert Prehn's Link Log + https://pre.hn + - <%= for link <- @links do %> - - <%= HtmlSanitizeEx.strip_tags(link["name"]) %> - - <%= link["summary"] %> - - <%= link["url"] %> - - <% end %> - - - """, assigns: assigns) + <%= for link <- @links do %> + + <%= HtmlSanitizeEx.strip_tags(link["name"]) %> + + <%= link["summary"] %> + + <%= link["url"] %> + + <% end %> + + + """, + assigns: assigns + ) path = Path.join(["priv", "static", "link-log", "feed.rss"]) diff --git a/lib/pre_dot_hn/markdown.ex b/lib/pre_dot_hn/markdown.ex index 295ccd4..6067ed0 100644 --- a/lib/pre_dot_hn/markdown.ex +++ b/lib/pre_dot_hn/markdown.ex @@ -60,7 +60,6 @@ defmodule PreDotHn.Markdown do defp highlight([text], lang), do: highlight(text, lang) defp highlight(text, lang) do - {:ok, highlight} = TreeSitter.highlight_html(text, lang || "plain") [_preamble, rest] = String.split(highlight, "")