Show related content

2 files changed, 25 insertions, 12 deletions

diff --git a/scripts/metadata.lua b/scripts/metadata.lua
index d0a4f45..49a9c55 100644
--- a/scripts/metadata.lua
+++ b/scripts/metadata.lua
@@ -84,12 +84,10 @@ function process_pages(meta)
 
     pages_all:sort(sort.page_sort(meta.list_order, meta.pages))
     pages_date_desc:sort(sort.page_sort("date_desc", meta.pages))
-    local pages_random = pages_all:clone():shuffle()
 
     meta.pages = {
         all = pages_all,
         date_desc = pages_date_desc,
-        random = pages_random,
         by_id = meta.pages
     }
 end
@@ -167,8 +165,6 @@ function process(global, build, meta)
 end
 
 function Meta(meta)
-    math.randomseed(os.time())
-
     local build = {}
 
     for key, value in pairs(meta) do
diff --git a/scripts/page.lua b/scripts/page.lua
index f3802a2..dcbb36f 100644
--- a/scripts/page.lua
+++ b/scripts/page.lua
@@ -96,7 +96,7 @@ function generate_list(meta)
     if meta.depth < 1 then return pandoc.List() end
 
     if meta.depth == 1 then
-        return meta.pages.all
+        return meta.pages.all:map(function (p) return d1_page_to_list_item(p) end)
     end
 
     if meta.depth == 2 then
@@ -130,6 +130,22 @@ function generate_list(meta)
     end
 end
 
+function generate_related(meta)
+    if not meta.parent then return nil end
+
+    meta = meta.parent
+
+    local items = meta.pages.random:take(2):map(function (p) return d1_page_to_list_item(p) end)
+
+    if #items == 0 then return nil end
+
+    return {
+        url = meta.url,
+        layout = meta.list_layout,
+        items = items
+    }
+end
+
 function deref_page(pages)
     return function(ref)
         return pages[utils.stringify(ref)]
@@ -139,7 +155,7 @@ end
 function process_pages(meta)
     meta.pages.all = meta.pages.all:filterMap(deref_page(meta.pages.by_id))
     meta.pages.date_desc = meta.pages.date_desc:filterMap(deref_page(meta.pages.by_id))
-    meta.pages.random = meta.pages.random:filterMap(deref_page(meta.pages.by_id))
+    meta.pages.random = meta.pages.all :clone():shuffle()
 end
 
 function resolve_urls(global, build, meta)
@@ -177,12 +193,10 @@ function process(global, build, meta, dir)
     process_base(meta)
     resolve_urls(global, build, meta)
 
-    if dir >= 0 then
-        for _, p in pairs(meta.pages.by_id) do
-            p.parent = meta
-            process(global, build, p, 1)
-            p.parent = nil
-        end
+    for _, p in pairs(meta.pages.by_id) do
+        p.parent = meta
+        process(global, build, p, 1)
+        p.parent = nil
     end
 
     process_pages(meta)
@@ -217,6 +231,8 @@ function prune(meta, up, down)
 end
 
 function Meta(meta)
+    math.randomseed(os.time())
+
     local build = {}
 
     for key, value in pairs(meta) do
@@ -250,6 +266,7 @@ function Meta(meta)
     process(global, build, meta, 0)
 
     meta.list = generate_list(meta)
+    meta.related = generate_related(meta)
 
     if global.menus and global.menus.main then
         global.menus.main = prep_menu(meta.namespace.full, global.menus.main)