Merge branch 'main' into fly

Author: danielres

lib/wik/markdown.ex

@@ -19,6 +19,12 @@ defmodule Wik.Markdown do
     |> preserve_html_entities()
   end
 
+  def cleanup(markdown) do
+    markdown
+    |> String.trim()
+    |> String.replace(~r/(\n\s*){3,}/, "\n\n")
+  end
+
   defp preserve_html_entities(text) do
     text
     |> String.replace("&", "&")
@@ -44,7 +50,7 @@ defmodule Wik.Markdown do
   end
 
   defp transform_node({"a", [{"href", href}], children, meta}, base_path, _embedded_pages) do
-    max_length = 50
+    max_length = 40
 
     simple_link? =
       case children do

lib/wik/page.ex

@@ -71,7 +71,7 @@ defmodule Wik.Page do
 
   # TODO: rename to create_or_update
   def upsert(user_id, group_slug, slug, body) do
-    body = Markdown.sanitize(body)
+    body = body |> Markdown.sanitize() |> Markdown.cleanup()
     resource_path = Page.resource_path(group_slug, slug)
     before = Page.load_raw(group_slug, slug)
     new = body