fix og:url

2 files changed, 28 insertions, 31 deletions

diff --git a/build/layout.moon b/build/layout.moon
index c188db9..5548281 100644
--- a/build/layout.moon
+++ b/build/layout.moon
@@ -56,4 +56,31 @@ logo = svg {
         { height: '1.3em', 'margin-left': '.3em', 'margin-top': '-0.12em' }
     }
   }
+  get_meta: =>
+    title = (@get 'title: text/plain') or @gett 'name: alpha'
+
+    l = (str) ->
+      str = str\gsub '[%s\\n]+$', ''
+      str\gsub '\\n', ' '
+    e = (str) -> string.format '%q', l str
+
+    meta = "
+      <meta charset=\"UTF-8\">
+      <title>#{l title}</title>
+    "
+
+    if page_meta = @get '_meta: mmm/dom'
+      meta ..= page_meta
+    else
+      meta ..= "
+      <meta property=\"og:title\" content=#{e title} />
+      <meta property=\"og:type\"  content=\"website\" />
+      <meta property=\"og:url\"   content=\"https://mmm.s-ol.nu#{@path}/\" />
+      <meta property=\"og:site_name\" content=\"mmm\" />"
+
+      if desc = @get 'description: text/plain'
+        meta ..= "
+      <meta property=\"og:description\" content=#{e desc} />"
+
+    meta
 }
diff --git a/build/render_fileder.moon b/build/render_fileder.moon
index 280be25..76c7856 100644
--- a/build/render_fileder.moon
+++ b/build/render_fileder.moon
@@ -2,7 +2,7 @@ require 'mmm'
 import get_path from require 'build.util'
 import tohtml from require 'mmm.component'
 import Browser from require 'mmm.mmmfs.browser'
-import header, footer from require 'build.layout'
+import get_meta, header, footer from require 'build.layout'
 
 export BROWSER
 
@@ -34,36 +34,6 @@ do
 
   seed path
 
-get_meta = =>
-  title = (@get 'title: text/plain') or @gett 'name: alpha'
-
-  l = (str) ->
-    str = str\gsub '[%s\\n]+$', ''
-    str\gsub '\\n', ' '
-  e = (str) -> string.format '%q', l str
-
-  meta = "
-    <meta charset=\"UTF-8\">
-    <title>#{l title}</title>
-  "
-
-  if page_meta = @get '_meta: mmm/dom'
-    meta ..= page_meta
-  else
-    _path = path
-    _path = '/' if _path == ''
-    meta ..= "
-    <meta property=\"og:title\" content=#{e title} />
-    <meta property=\"og:type\"  content=\"website\" />
-    <meta property=\"og:url\"   content=\"https://mmm.s-ol.nu#{_path}\" />
-    <meta property=\"og:site_name\" content=\"mmm\" />"
-
-    if desc = @get 'description: text/plain'
-      meta ..= "
-    <meta property=\"og:description\" content=#{e desc} />"
-
-  meta
-
 root = dofile '$bundle.lua'
 assert root, "couldn't load $bundle.lua"
 root\mount path, true