@rmdes/indiekit-endpoint-activitypub 1.0.27 → 1.0.29

package/index.js

@@ -149,11 +149,11 @@ export default class ActivityPubEndpoint {
     router.get("/admin/following", followingController(mp));
     router.get("/admin/activities", activitiesController(mp));
     router.get("/admin/featured", featuredGetController(mp));
-    router.post("/admin/featured/pin", featuredPinController());
-    router.post("/admin/featured/unpin", featuredUnpinController());
+    router.post("/admin/featured/pin", featuredPinController(mp));
+    router.post("/admin/featured/unpin", featuredUnpinController(mp));
     router.get("/admin/tags", featuredTagsGetController(mp));
-    router.post("/admin/tags/add", featuredTagsAddController());
-    router.post("/admin/tags/remove", featuredTagsRemoveController());
+    router.post("/admin/tags/add", featuredTagsAddController(mp));
+    router.post("/admin/tags/remove", featuredTagsRemoveController(mp));
     router.get("/admin/profile", profileGetController(mp));
     router.post("/admin/profile", profilePostController(mp));
     router.get("/admin/migrate", migrateGetController(mp, this.options));

package/lib/controllers/featured-tags.js

@@ -24,7 +24,7 @@ export function featuredTagsGetController(mountPath) {
   };
 }
 
-export function featuredTagsAddController() {
+export function featuredTagsAddController(mountPath) {
   return async (request, response, next) => {
     try {
       const { application } = request.app.locals;
@@ -44,14 +44,14 @@ export function featuredTagsAddController() {
         { upsert: true },
       );
 
-      response.redirect("back");
+      response.redirect(`${mountPath}/admin/tags`);
     } catch (error) {
       next(error);
     }
   };
 }
 
-export function featuredTagsRemoveController() {
+export function featuredTagsRemoveController(mountPath) {
   return async (request, response, next) => {
     try {
       const { application } = request.app.locals;
@@ -63,7 +63,7 @@ export function featuredTagsRemoveController() {
 
       await collection.deleteOne({ tag });
 
-      response.redirect("back");
+      response.redirect(`${mountPath}/admin/tags`);
     } catch (error) {
       next(error);
     }

package/lib/controllers/featured.js

@@ -69,7 +69,7 @@ export function featuredGetController(mountPath) {
   };
 }
 
-export function featuredPinController() {
+export function featuredPinController(mountPath) {
   return async (request, response, next) => {
     try {
       const { application } = request.app.locals;
@@ -90,14 +90,14 @@ export function featuredPinController() {
         { upsert: true },
       );
 
-      response.redirect("back");
+      response.redirect(`${mountPath}/admin/featured`);
     } catch (error) {
       next(error);
     }
   };
 }
 
-export function featuredUnpinController() {
+export function featuredUnpinController(mountPath) {
   return async (request, response, next) => {
     try {
       const { application } = request.app.locals;
@@ -109,7 +109,7 @@ export function featuredUnpinController() {
 
       await collection.deleteOne({ postUrl });
 
-      response.redirect("back");
+      response.redirect(`${mountPath}/admin/featured`);
     } catch (error) {
       next(error);
     }

package/lib/controllers/profile.js

@@ -5,6 +5,8 @@
  * POST: saves updated profile fields back to ap_profile
  */
 
+const ACTOR_TYPES = ["Person", "Service", "Organization"];
+
 export function profileGetController(mountPath) {
   return async (request, response, next) => {
     try {
@@ -18,6 +20,7 @@ export function profileGetController(mountPath) {
         title: response.locals.__("activitypub.profile.title"),
         mountPath,
         profile,
+        actorTypes: ACTOR_TYPES,
         result: null,
       });
     } catch (error) {
@@ -42,10 +45,23 @@ export function profilePostController(mountPath) {
         url,
         icon,
         image,
+        actorType,
         manuallyApprovesFollowers,
         authorizedFetch,
       } = request.body;
 
+      // Parse profile links (attachments) from form arrays
+      const linkNames = [].concat(request.body["link_name[]"] || []);
+      const linkValues = [].concat(request.body["link_value[]"] || []);
+      const attachments = [];
+      for (let i = 0; i < linkNames.length; i++) {
+        const n = linkNames[i]?.trim();
+        const v = linkValues[i]?.trim();
+        if (n && v) {
+          attachments.push({ name: n, value: v });
+        }
+      }
+
       const update = {
         $set: {
           name: name?.trim() || "",
@@ -53,8 +69,10 @@ export function profilePostController(mountPath) {
           url: url?.trim() || "",
           icon: icon?.trim() || "",
           image: image?.trim() || "",
+          actorType: ACTOR_TYPES.includes(actorType) ? actorType : "Person",
           manuallyApprovesFollowers: manuallyApprovesFollowers === "true",
           authorizedFetch: authorizedFetch === "true",
+          attachments,
           updatedAt: new Date().toISOString(),
         },
       };
@@ -67,6 +85,7 @@ export function profilePostController(mountPath) {
         title: response.locals.__("activitypub.profile.title"),
         mountPath,
         profile,
+        actorTypes: ACTOR_TYPES,
         result: {
           type: "success",
           text: response.locals.__("activitypub.profile.saved"),

package/lib/federation-setup.js

@@ -197,7 +197,11 @@ export function setupFederation(options) {
           personOptions.published = Temporal.Instant.from(profile.createdAt);
         }
 
-        return new ActorClass(personOptions);
+        // Actor type from profile overrides config default
+        const profileActorType = profile.actorType || actorType;
+        const ResolvedActorClass = actorTypeMap[profileActorType] || ActorClass;
+
+        return new ResolvedActorClass(personOptions);
       },
     )
     .mapHandle((_ctx, username) => {

package/locales/en.json

@@ -38,6 +38,14 @@
       "imageHint": "URL to a banner image shown at the top of your profile",
       "manualApprovalLabel": "Manually approve followers",
       "manualApprovalHint": "When enabled, follow requests require your approval before they take effect",
+      "actorTypeLabel": "Actor type",
+      "actorTypeHint": "How your account appears in the fediverse. Person for individuals, Service for bots or automated accounts, Organization for groups or companies.",
+      "linksLabel": "Profile links",
+      "linksHint": "Links shown on your fediverse profile. Add your website, social accounts, or other URLs. Pages that link back with rel=\"me\" will show as verified on Mastodon.",
+      "linkNameLabel": "Label",
+      "linkValueLabel": "URL",
+      "addLink": "Add link",
+      "removeLink": "Remove",
       "authorizedFetchLabel": "Require authorized fetch (secure mode)",
       "authorizedFetchHint": "When enabled, only servers with valid HTTP Signatures can fetch your actor and collections. This improves privacy but may reduce compatibility with some clients.",
       "save": "Save profile",

package/package.json

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

@@ -4,6 +4,7 @@
 {% from "input/macro.njk" import input with context %}
 {% from "textarea/macro.njk" import textarea with context %}
 {% from "checkboxes/macro.njk" import checkboxes with context %}
+{% from "radios/macro.njk" import radios with context %}
 {% from "button/macro.njk" import button with context %}
 {% from "notification-banner/macro.njk" import notificationBanner with context %}
 {% from "prose/macro.njk" import prose with context %}
@@ -57,6 +58,50 @@
       type: "url"
     }) }}
 
+    {{ radios({
+      name: "actorType",
+      fieldset: {
+        legend: __("activitypub.profile.actorTypeLabel")
+      },
+      hint: __("activitypub.profile.actorTypeHint"),
+      items: [{
+        label: "Person",
+        value: "Person"
+      }, {
+        label: "Service",
+        value: "Service"
+      }, {
+        label: "Organization",
+        value: "Organization"
+      }],
+      values: [profile.actorType or "Person"]
+    }) }}
+
+    <fieldset class="fieldset" style="margin-block-end: var(--space-l);">
+      <legend class="label">{{ __("activitypub.profile.linksLabel") }}</legend>
+      <p class="hint">{{ __("activitypub.profile.linksHint") }}</p>
+
+      <div id="profile-links">
+        {% if profile.attachments and profile.attachments.length > 0 %}
+          {% for att in profile.attachments %}
+            <div class="profile-link-row" style="display: grid; grid-template-columns: 1fr 2fr auto; gap: var(--space-s); align-items: end; margin-block-end: var(--space-s);">
+              <div>
+                <label class="label" for="link_name_{{ loop.index }}">{{ __("activitypub.profile.linkNameLabel") }}</label>
+                <input class="input" type="text" id="link_name_{{ loop.index }}" name="link_name[]" value="{{ att.name }}" placeholder="Website">
+              </div>
+              <div>
+                <label class="label" for="link_value_{{ loop.index }}">{{ __("activitypub.profile.linkValueLabel") }}</label>
+                <input class="input" type="url" id="link_value_{{ loop.index }}" name="link_value[]" value="{{ att.value }}" placeholder="https://example.com">
+              </div>
+              <button type="button" class="button button--small" onclick="this.closest('.profile-link-row').remove()" style="margin-block-end: 4px;">{{ __("activitypub.profile.removeLink") }}</button>
+            </div>
+          {% endfor %}
+        {% endif %}
+      </div>
+
+      <button type="button" class="button button--small" id="add-link-btn">{{ __("activitypub.profile.addLink") }}</button>
+    </fieldset>
+
     {{ checkboxes({
       name: "manuallyApprovesFollowers",
       items: [
@@ -83,4 +128,57 @@
 
     {{ button({ text: __("activitypub.profile.save") }) }}
   </form>
+
+  <script>
+    (function() {
+      var linkCount = {{ (profile.attachments.length if profile.attachments) or 0 }};
+      document.getElementById('add-link-btn').addEventListener('click', function() {
+        linkCount++;
+        var container = document.getElementById('profile-links');
+        var row = document.createElement('div');
+        row.className = 'profile-link-row';
+        row.style.cssText = 'display: grid; grid-template-columns: 1fr 2fr auto; gap: var(--space-s); align-items: end; margin-block-end: var(--space-s);';
+
+        var nameDiv = document.createElement('div');
+        var nameLabel = document.createElement('label');
+        nameLabel.className = 'label';
+        nameLabel.setAttribute('for', 'link_name_' + linkCount);
+        nameLabel.textContent = 'Label';
+        var nameInput = document.createElement('input');
+        nameInput.className = 'input';
+        nameInput.type = 'text';
+        nameInput.id = 'link_name_' + linkCount;
+        nameInput.name = 'link_name[]';
+        nameInput.placeholder = 'Website';
+        nameDiv.appendChild(nameLabel);
+        nameDiv.appendChild(nameInput);
+
+        var valueDiv = document.createElement('div');
+        var valueLabel = document.createElement('label');
+        valueLabel.className = 'label';
+        valueLabel.setAttribute('for', 'link_value_' + linkCount);
+        valueLabel.textContent = 'URL';
+        var valueInput = document.createElement('input');
+        valueInput.className = 'input';
+        valueInput.type = 'url';
+        valueInput.id = 'link_value_' + linkCount;
+        valueInput.name = 'link_value[]';
+        valueInput.placeholder = 'https://example.com';
+        valueDiv.appendChild(valueLabel);
+        valueDiv.appendChild(valueInput);
+
+        var removeBtn = document.createElement('button');
+        removeBtn.type = 'button';
+        removeBtn.className = 'button button--small';
+        removeBtn.style.cssText = 'margin-block-end: 4px;';
+        removeBtn.textContent = 'Remove';
+        removeBtn.addEventListener('click', function() { row.remove(); });
+
+        row.appendChild(nameDiv);
+        row.appendChild(valueDiv);
+        row.appendChild(removeBtn);
+        container.appendChild(row);
+      });
+    })();
+  </script>
 {% endblock %}