@rmdes/indiekit-endpoint-activitypub 2.0.14 → 2.0.15

package/lib/controllers/reader.js

@@ -126,7 +126,10 @@ export function readerController(mountPath) {
               item._moderated = true;
               item._moderationReason = isMutedActor
                 ? "muted_account"
-                : `muted_keyword:${matchedKeyword}`;
+                : "muted_keyword";
+              if (matchedKeyword) {
+                item._moderationKeyword = matchedKeyword;
+              }
               return true;
             }
             return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",

package/views/partials/ap-item-card.njk

@@ -9,11 +9,10 @@
 <article class="ap-card{% if item.type %} ap-card--{{ item.type }}{% endif %}{% if item.inReplyTo %} ap-card--reply{% endif %}{% if item._moderated %} ap-card--moderated{% endif %}">
   {# Moderation content warning wrapper #}
   {% if item._moderated %}
-    {% set modReason = item._moderationReason %}
-    {% if modReason == "muted_account" %}
+    {% if item._moderationReason == "muted_account" %}
       {% set modLabel = __("activitypub.moderation.cwMutedAccount") %}
-    {% elif modReason.startsWith("muted_keyword:") %}
-      {% set modLabel = __("activitypub.moderation.cwMutedKeyword") + " \"" + modReason.replace("muted_keyword:", "") + "\"" %}
+    {% elif item._moderationReason == "muted_keyword" and item._moderationKeyword %}
+      {% set modLabel = __("activitypub.moderation.cwMutedKeyword") + ' "' + item._moderationKeyword + '"' %}
     {% else %}
       {% set modLabel = __("activitypub.moderation.cwFiltered") %}
     {% endif %}
@@ -201,6 +200,11 @@
     </a>
     <div x-show="error" x-text="error" class="ap-card__action-error" x-transition></div>
   </footer>
+  {# Close moderation content warning wrapper #}
+  {% if item._moderated %}
+      </div>{# /x-show="shown" #}
+    </div>{# /ap-card__moderation-cw #}
+  {% endif %}
 </article>
 
 {% endif %}{# end hasCardContent/hasCardTitle/hasCardMedia guard #}