diff --git a/_includes/components/widgets/post-navigation.njk b/_includes/components/widgets/post-navigation.njk index 3bd08a8..c67f896 100644 --- a/_includes/components/widgets/post-navigation.njk +++ b/_includes/components/widgets/post-navigation.njk @@ -1,22 +1,26 @@ {# Post Navigation Widget - Previous/Next #} -{% if previousPost or nextPost %} +{# Uses previousInCollection/nextInCollection filters to find adjacent posts #} +{% set _prevPost = collections.posts | previousInCollection(page) %} +{% set _nextPost = collections.posts | nextInCollection(page) %} + +{% if _prevPost or _nextPost %}

More Posts

- {% if previousPost %} + {% if _prevPost %}
Previous - {% set _likedUrl = previousPost.data.likeOf or previousPost.data.like_of %} - {% set _bookmarkedUrl = previousPost.data.bookmarkOf or previousPost.data.bookmark_of %} - {% set _repostedUrl = previousPost.data.repostOf or previousPost.data.repost_of %} - {% set _replyToUrl = previousPost.data.inReplyTo or previousPost.data.in_reply_to %} - + {% set _likedUrl = _prevPost.data.likeOf or _prevPost.data.like_of %} + {% set _bookmarkedUrl = _prevPost.data.bookmarkOf or _prevPost.data.bookmark_of %} + {% set _repostedUrl = _prevPost.data.repostOf or _prevPost.data.repost_of %} + {% set _replyToUrl = _prevPost.data.inReplyTo or _prevPost.data.in_reply_to %} + {% if _likedUrl %} Liked {{ _likedUrl | replace("https://", "") | truncate(35) }} {% elif _bookmarkedUrl %} - {{ previousPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }} + {{ _prevPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }} {% elif _repostedUrl %} Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }} @@ -24,25 +28,25 @@ Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }} {% else %} - {{ previousPost.data.title or previousPost.data.name or (previousPost.templateContent | striptags | truncate(50)) or "Note" }} + {{ _prevPost.data.title or _prevPost.data.name or (_prevPost.templateContent | striptags | truncate(50)) or "Note" }} {% endif %}
{% endif %} - {% if nextPost %} + {% if _nextPost %}
Next - {% set _likedUrl = nextPost.data.likeOf or nextPost.data.like_of %} - {% set _bookmarkedUrl = nextPost.data.bookmarkOf or nextPost.data.bookmark_of %} - {% set _repostedUrl = nextPost.data.repostOf or nextPost.data.repost_of %} - {% set _replyToUrl = nextPost.data.inReplyTo or nextPost.data.in_reply_to %} - + {% set _likedUrl = _nextPost.data.likeOf or _nextPost.data.like_of %} + {% set _bookmarkedUrl = _nextPost.data.bookmarkOf or _nextPost.data.bookmark_of %} + {% set _repostedUrl = _nextPost.data.repostOf or _nextPost.data.repost_of %} + {% set _replyToUrl = _nextPost.data.inReplyTo or _nextPost.data.in_reply_to %} + {% if _likedUrl %} Liked {{ _likedUrl | replace("https://", "") | truncate(35) }} {% elif _bookmarkedUrl %} - {{ nextPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }} + {{ _nextPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }} {% elif _repostedUrl %} Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }} @@ -50,7 +54,7 @@ Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }} {% else %} - {{ nextPost.data.title or nextPost.data.name or (nextPost.templateContent | striptags | truncate(50)) or "Note" }} + {{ _nextPost.data.title or _nextPost.data.name or (_nextPost.templateContent | striptags | truncate(50)) or "Note" }} {% endif %}
diff --git a/_includes/components/widgets/webmentions.njk b/_includes/components/widgets/webmentions.njk index 674d42f..d22e0d2 100644 --- a/_includes/components/widgets/webmentions.njk +++ b/_includes/components/widgets/webmentions.njk @@ -1,5 +1,6 @@ -{# Webmentions Widget (if this post has any) #} -{% if webmentions and webmentions.length %} +{# Webmentions Sidebar Widget (compact counts for this post) #} +{% set _mentions = webmentions | webmentionsForUrl(page.url, urlAliases) %} +{% if _mentions and _mentions.length %}

@@ -8,9 +9,9 @@ Interactions

- {% set likes = webmentions | filter("like-of") %} - {% set reposts = webmentions | filter("repost-of") %} - {% set replies = webmentions | filter("in-reply-to") %} + {% set likes = _mentions | webmentionsByType("likes") %} + {% set reposts = _mentions | webmentionsByType("reposts") %} + {% set replies = _mentions | webmentionsByType("replies") %} {% if likes.length %}

diff --git a/eleventy.config.js b/eleventy.config.js index 6c8b15d..bbe41b2 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -318,6 +318,22 @@ export default function (eleventyConfig) { return mentions.filter((m) => m["wm-property"] === wmProperty); }); + // Post navigation — find previous/next post in a collection + // (Nunjucks {% set %} inside {% for %} doesn't propagate, so we need filters) + eleventyConfig.addFilter("previousInCollection", function (collection, page) { + if (!collection || !page) return null; + const index = collection.findIndex((p) => p.url === page.url); + return index > 0 ? collection[index - 1] : null; + }); + + eleventyConfig.addFilter("nextInCollection", function (collection, page) { + if (!collection || !page) return null; + const index = collection.findIndex((p) => p.url === page.url); + return index >= 0 && index < collection.length - 1 + ? collection[index + 1] + : null; + }); + // Collections for different post types // Note: content path is content/ due to symlink structure // "posts" shows ALL content types combined