@rmdes/indiekit-endpoint-activitypub 3.13.0 → 3.13.2

package/lib/mastodon/routes/statuses.js

@@ -453,7 +453,9 @@ router.put("/api/v1/statuses/:id", tokenRequired, scopeRequired("write", "write:
         : new URL(application.micropubEndpoint, application.url).href;
 
       const token =
-        req.session?.access_token || req.mastodonToken?.accessToken;
+        req.session?.access_token ||
+        req.mastodonToken?.indieauthToken ||
+        req.mastodonToken?.accessToken;
       if (token) {
         const updatePayload = {
           action: "update",
@@ -513,13 +515,16 @@ router.put("/api/v1/statuses/:id", tokenRequired, scopeRequired("write", "write:
     const updated = await collections.ap_timeline.findOne({
       _id: item._id,
     });
-    const { serializeStatus, setLocalIdentity } = await import(
-      "../entities/status.js"
-    );
-    const handle = pluginOptions.actor?.handle || "";
-    setLocalIdentity(localPublicationUrl, handle);
+    const interactionState = await loadItemInteractions(collections, updated);
+    const { replyIdMap, replyAccountIdMap } = await resolveReplyIds(collections.ap_timeline, [updated]);
 
-    const serialized = serializeStatus(updated, { baseUrl });
+    const serialized = serializeStatus(updated, {
+      baseUrl,
+      ...interactionState,
+      pinnedIds: new Set(),
+      replyIdMap,
+      replyAccountIdMap,
+    });
     res.json(serialized);
   } catch (error) {
     next(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "3.13.0",
+  "version": "3.13.2",
   "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/activitypub-settings.njk

@@ -11,8 +11,6 @@
     {{ notificationBanner({ type: "success", text: "Settings saved." }) }}
   {% endif %}
 
-  {{ heading({ text: title }) }}
-
   <form method="POST" action="{{ mountPath }}/admin/settings">
     <input type="hidden" name="_csrf" value="{{ csrfToken }}">
 
@@ -47,13 +45,16 @@
 
       {{ radios({
         name: "defaultVisibility",
-        label: "Default post visibility",
+        fieldset: {
+          legend: "Default post visibility"
+        },
         hint: "Default visibility for new posts. Default: " + defaults.defaultVisibility,
         items: [
-          { value: "public", text: "Public", checked: settings.defaultVisibility == "public" },
-          { value: "unlisted", text: "Unlisted", checked: settings.defaultVisibility == "unlisted" },
-          { value: "private", text: "Followers only", checked: settings.defaultVisibility == "private" }
-        ]
+          { value: "public", label: "Public" },
+          { value: "unlisted", label: "Unlisted" },
+          { value: "private", label: "Followers only" }
+        ],
+        values: [settings.defaultVisibility]
       }) }}
 
       {{ input({
@@ -128,14 +129,17 @@
 
       {{ radios({
         name: "logLevel",
-        label: "Federation log level",
+        fieldset: {
+          legend: "Federation log level"
+        },
         hint: "Fedify log verbosity. Default: " + defaults.logLevel,
         items: [
-          { value: "debug", text: "Debug", checked: settings.logLevel == "debug" },
-          { value: "info", text: "Info", checked: settings.logLevel == "info" },
-          { value: "warning", text: "Warning", checked: settings.logLevel == "warning" },
-          { value: "error", text: "Error", checked: settings.logLevel == "error" }
-        ]
+          { value: "debug", label: "Debug" },
+          { value: "info", label: "Info" },
+          { value: "warning", label: "Warning" },
+          { value: "error", label: "Error" }
+        ],
+        values: [settings.logLevel]
       }) }}
     </fieldset>