Better filtering

3 files changed, 12 insertions, 5 deletions

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 6f31879..0058ab0 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/configure-pages@v3
       - name: Run a multi-line script
         run: |
-          wget https://github.com/mitjafelicijan/jbmafp/releases/download/v0.2/jbmafp.zip
+          wget https://github.com/mitjafelicijan/jbmafp/releases/download/v0.3/jbmafp.zip
           unzip jbmafp.zip
           chmod +x jbmafp
           ./jbmafp -b
diff --git a/templates/note.html b/templates/note.html
index 5f3f928..c543773 100644
--- a/templates/note.html
+++ b/templates/note.html
@@ -17,8 +17,8 @@
   <p><big><strong>Other notes</strong></big></p>
   <ul itemscope itemtype="https://schema.org/SiteNavigationElement" role="list" aria-label="Other notes">
     <meta itemprop="name" content="Other notes">
-    {{ range random 20 .Pages }}
-      {{ if and (eq .Type "note") (not .Draft) }}
+    {{ range .Pages | filterbytype "note" | random 15 }}
+      {{ if not .Draft }}
         <li>
           {{ range .Meta.tags }}
             <mark>{{ . }}</mark>
diff --git a/templates/post.html b/templates/post.html
index c8925fa..1fbdd04 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -4,6 +4,13 @@
 {{ define "description" }}{{ .Page.Summary }}{{ end }}
 
 {{ define "content" }}
+
+<ul>
+  {{ range .Pages | filterbytype "post" | random 10 }}
+    <li><a href="{{ .RelPermalink }}">{{ .Type }} - {{ .Title }}</a></li>
+  {{ end }}
+</ul>
+
 <section>
   <h1>{{ .Page.Title }}</h1>
   <p><cap>{{ .Page.Type }}</cap>, {{ .Page.Created.Format "Jan 2, 2006" }}, on <a href="{{ .Config.BaseURL }}">{{ .Config.Title }}'s blog</a></p>
@@ -17,8 +24,8 @@
   <p><big><strong>Other posts</strong></big></p>
   <ul itemscope itemtype="https://schema.org/SiteNavigationElement" role="list" aria-label="Other posts">
     <meta itemprop="name" content="Other post">
-    {{ range random 20 .Pages }}
-      {{ if and (eq .Type "post") (not .Draft) }}
+    {{ range .Pages | filterbytype "post" | random 15 }}
+      {{ if not .Draft }}
         <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
       {{ end }}
     {{ end }}