svemagie/indiekit-endpoint-activitypub
1
0
Fork 0
mirror of https://github.com/svemagie/indiekit-endpoint-activitypub.git synced 2026-04-02 15:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename tag template variable to hashtag to avoid Nunjucks macro collision

Browse Source 
The base layout default.njk imports a `tag` component macro which shadows
the controller's `tag` variable in function/filter argument contexts.
Renaming to `hashtag` eliminates the collision entirely.
This commit is contained in:
Ricardo
2026-02-27 14:05:44 +01:00
parent 41bde656e4
commit cfc5af8092
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
views/activitypub-tag-timeline.njk
View File

@@ -4,7 +4,7 @@
{# Tag header #}
<header class="ap-tag-header">
<div class="ap-tag-header__info">
<h2 class="ap-tag-header__title">#{{ tag }}</h2>
<h2 class="ap-tag-header__title">#{{ hashtag }}</h2>
<p class="ap-tag-header__count">
{{ __("activitypub.reader.tagTimeline.postsTagged", items.length) }}
</p>
@@ -13,7 +13,7 @@
{% if isFollowed %}
<form action="{{ mountPath }}/admin/reader/unfollow-tag" method="post" class="ap-tag-header__follow-form">
<input type="hidden" name="_csrf" value="{{ csrfToken }}">
<input type="hidden" name="tag" value="{{ tag }}">
<input type="hidden" name="tag" value="{{ hashtag }}">
<button type="submit" class="ap-tag-header__unfollow-btn">
{{ __("activitypub.reader.tagTimeline.unfollowTag") }}
</button>
@@ -21,7 +21,7 @@
{% else %}
<form action="{{ mountPath }}/admin/reader/follow-tag" method="post" class="ap-tag-header__follow-form">
<input type="hidden" name="_csrf" value="{{ csrfToken }}">
<input type="hidden" name="tag" value="{{ tag }}">
<input type="hidden" name="tag" value="{{ hashtag }}">
<button type="submit" class="ap-tag-header__follow-btn">
{{ __("activitypub.reader.tagTimeline.followTag") }}
</button>
@@ -37,7 +37,7 @@
{% if items.length > 0 %}
<div class="ap-timeline"
data-mount-path="{{ mountPath }}"
data-tag="{{ tag }}"
data-tag="{{ hashtag }}"
data-before="{{ before if before else '' }}">
{% for item in items %}
{% include "partials/ap-item-card.njk" %}
@@ -48,12 +48,12 @@
{% if before or after %}
<nav class="ap-pagination ap-pagination--js-hidden" id="ap-tag-pagination">
{% if after %}
<a href="?tag={{ tag }}&after={{ after }}" class="ap-pagination__prev">
<a href="?tag={{ hashtag }}&after={{ after }}" class="ap-pagination__prev">
{{ __("activitypub.reader.pagination.newer") }}
</a>
{% endif %}
{% if before %}
<a href="?tag={{ tag }}&before={{ before }}" class="ap-pagination__next">
<a href="?tag={{ hashtag }}&before={{ before }}" class="ap-pagination__next">
{{ __("activitypub.reader.pagination.older") }}
</a>
{% endif %}
@@ -66,7 +66,7 @@
id="ap-load-more"
data-before="{{ before }}"
data-tab=""
data-tag="{{ tag }}"
data-tag="{{ hashtag }}"
x-data="apInfiniteScroll()"
x-init="init()"
@ap-append-items.window="appendItems($event.detail)">
@@ -79,6 +79,6 @@
</div>
{% endif %}
{% else %}
{{ prose({ text: __("activitypub.reader.tagTimeline.noPosts") | replace("%s", tag) }) }}
{{ prose({ text: __("activitypub.reader.tagTimeline.noPosts", hashtag) }) }}
{% endif %}
{% endblock %}