mirror of
https://github.com/svemagie/indiekit-endpoint-activitypub.git
synced 2026-04-02 15:44:58 +02:00
eefa46f0c1
Upstream v2.10.0 adds: outbound Delete, visibility addressing (unlisted/
followers-only), Content Warning (sensitive flag + summary), inbound poll
rendering, Flag/report handler, DM support files.
Conflict resolution — all four conflicts were additive (no code removed):
lib/controllers/reader.js: union of validTabs — fork added "mention",
upstream added "dm" and "report"; result keeps all five additions.
lib/storage/notifications.js: union of count keys — fork added mention:0,
upstream added dm:0 and report:0; result keeps the fork's mention split
logic alongside the new upstream keys.
views/partials/ap-notification-card.njk: fork kept isDirect 🔒 badge for
direct mentions; upstream added ✉ for dm and ⚑ for report; result keeps
the isDirect branch and appends the two new type badges.
package.json: upstream bumped to 2.10.0; we bump to 2.10.1 to reflect our
own Alpine.js and publication-aware docloader bug fixes on top.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
91 lines
4.2 KiB
Plaintext
91 lines
4.2 KiB
Plaintext
{% extends "layouts/ap-reader.njk" %}
|
|
|
|
{% from "heading/macro.njk" import heading with context %}
|
|
{% from "prose/macro.njk" import prose with context %}
|
|
|
|
{% block readercontent %}
|
|
{# Tab navigation #}
|
|
{% set notifBase = mountPath + "/admin/reader/notifications" %}
|
|
<nav class="ap-tabs">
|
|
<a href="{{ notifBase }}?tab=reply" class="ap-tab{% if tab == 'reply' %} ap-tab--active{% endif %}">
|
|
{{ __("activitypub.notifications.tabs.replies") }}
|
|
{% if tabCounts.reply %}<span class="ap-tab__count">{{ tabCounts.reply }}</span>{% endif %}
|
|
</a>
|
|
<a href="{{ notifBase }}?tab=mention" class="ap-tab{% if tab == 'mention' %} ap-tab--active{% endif %}">
|
|
🔒 {{ __("activitypub.notifications.tabs.direct") if __("activitypub.notifications.tabs.direct") != "activitypub.notifications.tabs.direct" else "Direct" }}
|
|
{% if tabCounts.mention %}<span class="ap-tab__count">{{ tabCounts.mention }}</span>{% endif %}
|
|
</a>
|
|
<a href="{{ notifBase }}?tab=like" class="ap-tab{% if tab == 'like' %} ap-tab--active{% endif %}">
|
|
{{ __("activitypub.notifications.tabs.likes") }}
|
|
{% if tabCounts.like %}<span class="ap-tab__count">{{ tabCounts.like }}</span>{% endif %}
|
|
</a>
|
|
<a href="{{ notifBase }}?tab=boost" class="ap-tab{% if tab == 'boost' %} ap-tab--active{% endif %}">
|
|
{{ __("activitypub.notifications.tabs.boosts") }}
|
|
{% if tabCounts.boost %}<span class="ap-tab__count">{{ tabCounts.boost }}</span>{% endif %}
|
|
</a>
|
|
<a href="{{ notifBase }}?tab=follow" class="ap-tab{% if tab == 'follow' %} ap-tab--active{% endif %}">
|
|
{{ __("activitypub.notifications.tabs.follows") }}
|
|
{% if tabCounts.follow %}<span class="ap-tab__count">{{ tabCounts.follow }}</span>{% endif %}
|
|
</a>
|
|
<a href="{{ notifBase }}?tab=dm" class="ap-tab{% if tab == 'dm' %} ap-tab--active{% endif %}">
|
|
{{ __("activitypub.notifications.tabs.dms") }}
|
|
{% if tabCounts.dm %}<span class="ap-tab__count">{{ tabCounts.dm }}</span>{% endif %}
|
|
</a>
|
|
<a href="{{ notifBase }}?tab=report" class="ap-tab{% if tab == 'report' %} ap-tab--active{% endif %}">
|
|
{{ __("activitypub.notifications.tabs.reports") }}
|
|
{% if tabCounts.report %}<span class="ap-tab__count">{{ tabCounts.report }}</span>{% endif %}
|
|
</a>
|
|
<a href="{{ notifBase }}?tab=all" class="ap-tab{% if tab == 'all' %} ap-tab--active{% endif %}">
|
|
{{ __("activitypub.notifications.tabs.all") }}
|
|
{% if tabCounts.all %}<span class="ap-tab__count">{{ tabCounts.all }}</span>{% endif %}
|
|
</a>
|
|
</nav>
|
|
|
|
{# Toolbar — mark read + clear all #}
|
|
<div class="ap-notifications__toolbar">
|
|
{% if unreadCount > 0 %}
|
|
<form method="post" action="{{ notifBase }}/mark-read">
|
|
<input type="hidden" name="_csrf" value="{{ csrfToken }}">
|
|
<button type="submit" class="ap-notifications__btn">{{ __("activitypub.notifications.markAllRead") }}</button>
|
|
</form>
|
|
{% endif %}
|
|
<form method="post" action="{{ notifBase }}/clear"
|
|
onsubmit="return confirm('{{ __("activitypub.notifications.clearConfirm") }}')">
|
|
<input type="hidden" name="_csrf" value="{{ csrfToken }}">
|
|
<button type="submit" class="ap-notifications__btn ap-notifications__btn--danger">{{ __("activitypub.notifications.clearAll") }}</button>
|
|
</form>
|
|
</div>
|
|
|
|
{% if tab == "mention" %}
|
|
{# DM thread view — grouped by conversation #}
|
|
{% if conversations and conversations.length > 0 %}
|
|
<div class="ap-dm-conversations">
|
|
{% for conv in conversations %}
|
|
{% include "partials/ap-dm-thread.njk" %}
|
|
{% endfor %}
|
|
</div>
|
|
{% else %}
|
|
{{ prose({ text: "No direct messages yet." }) }}
|
|
{% endif %}
|
|
{% else %}
|
|
{% if items.length > 0 %}
|
|
<div class="ap-timeline">
|
|
{% for item in items %}
|
|
{% include "partials/ap-notification-card.njk" %}
|
|
{% endfor %}
|
|
</div>
|
|
|
|
{# Pagination — preserve active tab #}
|
|
{% if before %}
|
|
<nav class="ap-pagination">
|
|
<a href="?tab={{ tab }}&before={{ before }}" class="ap-pagination__next">
|
|
{{ __("activitypub.reader.pagination.older") }}
|
|
</a>
|
|
</nav>
|
|
{% endif %}
|
|
{% else %}
|
|
{{ prose({ text: __("activitypub.notifications.empty") }) }}
|
|
{% endif %}
|
|
{% endif %}
|
|
{% endblock %}
|