@rmdes/indiekit-endpoint-activitypub 1.1.15 → 1.1.17

package/assets/reader.css

@@ -4,6 +4,54 @@
  * Uses Indiekit CSS custom properties for automatic dark mode support
  */
 
+/* ==========================================================================
+   Fediverse Lookup
+   ========================================================================== */
+
+.ap-lookup {
+  display: flex;
+  gap: var(--space-xs);
+  margin-bottom: var(--space-m);
+}
+
+.ap-lookup__input {
+  flex: 1;
+  padding: var(--space-s) var(--space-m);
+  border: var(--border-width-thin) solid var(--color-outline);
+  border-radius: var(--border-radius-small);
+  background: var(--color-offset);
+  color: var(--color-on-background);
+  font-size: var(--font-size-m);
+  font-family: inherit;
+}
+
+.ap-lookup__input::placeholder {
+  color: var(--color-on-offset);
+}
+
+.ap-lookup__input:focus {
+  outline: 2px solid var(--color-primary);
+  outline-offset: -1px;
+  border-color: var(--color-primary);
+}
+
+.ap-lookup__btn {
+  padding: var(--space-s) var(--space-m);
+  border: var(--border-width-thin) solid var(--color-primary);
+  border-radius: var(--border-radius-small);
+  background: var(--color-primary);
+  color: var(--color-on-primary);
+  font-size: var(--font-size-m);
+  font-family: inherit;
+  font-weight: 600;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.ap-lookup__btn:hover {
+  opacity: 0.9;
+}
+
 /* ==========================================================================
    Tab Navigation
    ========================================================================== */
@@ -793,9 +841,34 @@
   box-shadow: 0 0 8px 0 hsl(var(--tint-yellow) 50% / 0.3);
 }
 
-.ap-notification__icon {
+.ap-notification__avatar-wrap {
   flex-shrink: 0;
-  font-size: 1.5em;
+  position: relative;
+}
+
+.ap-notification__avatar {
+  border: var(--border-width-thin) solid var(--color-outline);
+  border-radius: 50%;
+  height: 40px;
+  object-fit: cover;
+  width: 40px;
+}
+
+.ap-notification__avatar--default {
+  align-items: center;
+  background: var(--color-offset-variant);
+  color: var(--color-on-offset);
+  display: inline-flex;
+  font-size: 1.1em;
+  font-weight: 600;
+  justify-content: center;
+}
+
+.ap-notification__type-badge {
+  bottom: -2px;
+  font-size: 0.75em;
+  position: absolute;
+  right: -4px;
 }
 
 .ap-notification__body {

package/index.js

@@ -57,6 +57,7 @@ import {
   featuredTagsAddController,
   featuredTagsRemoveController,
 } from "./lib/controllers/featured-tags.js";
+import { resolveController } from "./lib/controllers/resolve.js";
 import {
   refollowPauseController,
   refollowResumeController,
@@ -202,6 +203,7 @@ export default class ActivityPubEndpoint {
     router.post("/admin/reader/unlike", unlikeController(mp, this));
     router.post("/admin/reader/boost", boostController(mp, this));
     router.post("/admin/reader/unboost", unboostController(mp, this));
+    router.get("/admin/reader/resolve", resolveController(mp, this));
     router.get("/admin/reader/profile", remoteProfileController(mp, this));
     router.get("/admin/reader/post", postDetailController(mp, this));
     router.post("/admin/reader/follow", followController(mp, this));

package/lib/controllers/followers.js

@@ -32,7 +32,7 @@ export function followersController(mountPath) {
       const cursor = buildCursor(page, totalPages, mountPath + "/admin/followers");
 
       response.render("activitypub-followers", {
-        title: response.locals.__("activitypub.followers"),
+        title: `${totalCount} ${response.locals.__("activitypub.followers")}`,
         followers,
         followerCount: totalCount,
         mountPath,

package/lib/controllers/following.js

@@ -32,7 +32,7 @@ export function followingController(mountPath) {
       const cursor = buildCursor(page, totalPages, mountPath + "/admin/following");
 
       response.render("activitypub-following", {
-        title: response.locals.__("activitypub.following"),
+        title: `${totalCount} ${response.locals.__("activitypub.following")}`,
         following,
         followingCount: totalCount,
         mountPath,

package/lib/controllers/resolve.js

@@ -0,0 +1,109 @@
+/**
+ * Resolve controller — accepts any fediverse URL or handle, resolves it
+ * via lookupObject(), and redirects to the appropriate internal view.
+ */
+import {
+  Article,
+  Note,
+  Person,
+  Service,
+  Application,
+  Organization,
+  Group,
+} from "@fedify/fedify";
+
+/**
+ * GET /admin/reader/resolve?q=<url-or-handle>
+ * Resolves a fediverse URL or @user@domain handle and redirects to
+ * the post detail or remote profile view.
+ */
+export function resolveController(mountPath, plugin) {
+  return async (request, response, next) => {
+    try {
+      const query = (request.query.q || "").trim();
+
+      if (!query) {
+        return response.redirect(`${mountPath}/admin/reader`);
+      }
+
+      if (!plugin._federation) {
+        return response.status(503).render("error", {
+          title: "Error",
+          content: "Federation not initialized",
+        });
+      }
+
+      const handle = plugin.options.actor.handle;
+      const ctx = plugin._federation.createContext(
+        new URL(plugin._publicationUrl),
+        { handle, publicationUrl: plugin._publicationUrl },
+      );
+
+      const documentLoader = await ctx.getDocumentLoader({
+        identifier: handle,
+      });
+
+      // Determine if input is a URL or a handle
+      // lookupObject accepts: URLs, @user@domain, user@domain, acct:user@domain
+      let lookupInput;
+
+      try {
+        // If it parses as a URL, pass as URL object
+        const parsed = new URL(query);
+        lookupInput = parsed;
+      } catch {
+        // Not a URL — treat as handle (strip leading @ if present)
+        lookupInput = query;
+      }
+
+      let object;
+
+      try {
+        object = await ctx.lookupObject(lookupInput, { documentLoader });
+      } catch (error) {
+        console.warn(
+          `[resolve] lookupObject failed for "${query}":`,
+          error.message,
+        );
+      }
+
+      if (!object) {
+        return response.status(404).render("error", {
+          title: response.locals.__("activitypub.reader.resolve.notFoundTitle"),
+          content: response.locals.__(
+            "activitypub.reader.resolve.notFound",
+          ),
+        });
+      }
+
+      // Determine object type and redirect accordingly
+      const objectUrl =
+        object.id?.href || object.url?.href || query;
+
+      if (
+        object instanceof Person ||
+        object instanceof Service ||
+        object instanceof Application ||
+        object instanceof Organization ||
+        object instanceof Group
+      ) {
+        return response.redirect(
+          `${mountPath}/admin/reader/profile?url=${encodeURIComponent(objectUrl)}`,
+        );
+      }
+
+      if (object instanceof Note || object instanceof Article) {
+        return response.redirect(
+          `${mountPath}/admin/reader/post?url=${encodeURIComponent(objectUrl)}`,
+        );
+      }
+
+      // Unknown type — try post detail as fallback
+      return response.redirect(
+        `${mountPath}/admin/reader/post?url=${encodeURIComponent(objectUrl)}`,
+      );
+    } catch (error) {
+      next(error);
+    }
+  };
+}

package/lib/storage/notifications.js

@@ -66,9 +66,10 @@ export async function getNotifications(collections, options = {}) {
     query.read = false;
   }
 
-  // Cursor pagination
+  // Cursor pagination — published is stored as ISO string, so compare
+  // as strings (lexicographic ISO 8601 comparison is correct for dates)
   if (options.before) {
-    query.published = { $lt: new Date(options.before) };
+    query.published = { $lt: options.before };
   }
 
   const rawItems = await ap_notifications
@@ -85,9 +86,9 @@ export async function getNotifications(collections, options = {}) {
       : item.published,
   }));
 
-  // Generate cursor for next page
+  // Generate cursor for next page (only if full page returned = more may exist)
   const before =
-    items.length > 0
+    items.length === limit
       ? items[items.length - 1].published
       : null;
 

package/lib/storage/timeline.js

@@ -94,23 +94,20 @@ export async function getTimelineItems(collections, options = {}) {
     query["author.url"] = options.authorUrl;
   }
 
-  // Cursor pagination — validate dates
+  // Cursor pagination — published is stored as ISO string, so compare
+  // as strings (lexicographic ISO 8601 comparison is correct for dates)
   if (options.before) {
-    const beforeDate = new Date(options.before);
-
-    if (Number.isNaN(beforeDate.getTime())) {
+    if (Number.isNaN(new Date(options.before).getTime())) {
       throw new Error("Invalid before cursor");
     }
 
-    query.published = { $lt: beforeDate };
+    query.published = { $lt: options.before };
   } else if (options.after) {
-    const afterDate = new Date(options.after);
-
-    if (Number.isNaN(afterDate.getTime())) {
+    if (Number.isNaN(new Date(options.after).getTime())) {
       throw new Error("Invalid after cursor");
     }
 
-    query.published = { $gt: afterDate };
+    query.published = { $gt: options.after };
   }
 
   const rawItems = await ap_timeline
@@ -128,13 +125,16 @@ export async function getTimelineItems(collections, options = {}) {
   }));
 
   // Generate cursors for pagination
+  // Items are sorted newest-first, so:
+  // - "before" cursor (for "Older" link) = oldest item's date (last in array)
+  // - "after" cursor (for "Newer" link) = newest item's date (first in array)
   const before =
-    items.length > 0
-      ? items[0].published
+    items.length === limit
+      ? items[items.length - 1].published
       : null;
   const after =
-    items.length > 0
-      ? items[items.length - 1].published
+    items.length > 0 && (options.before || options.after)
+      ? items[0].published
       : null;
 
   return {
@@ -190,7 +190,9 @@ export async function updateTimelineItem(collections, uid, updates) {
  */
 export async function deleteOldTimelineItems(collections, cutoffDate) {
   const { ap_timeline } = collections;
-  const result = await ap_timeline.deleteMany({ published: { $lt: cutoffDate } });
+  // published is stored as ISO string — convert cutoff to string for comparison
+  const cutoff = cutoffDate instanceof Date ? cutoffDate.toISOString() : cutoffDate;
+  const result = await ap_timeline.deleteMany({ published: { $lt: cutoff } });
   return result.deletedCount;
 }
 

package/locales/en.json

@@ -191,6 +191,13 @@
         "loadingThread": "Loading thread...",
         "threadError": "Could not load full thread"
       },
+      "resolve": {
+        "placeholder": "Paste a fediverse URL or @user@domain handle…",
+        "label": "Look up a fediverse post or account",
+        "button": "Look up",
+        "notFoundTitle": "Not found",
+        "notFound": "Could not find this post or account. The URL may be invalid, the server may be unavailable, or the content may have been deleted."
+      },
       "linkPreview": {
         "label": "Link preview"
       }

package/package.json

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

@@ -7,8 +7,6 @@
 {% from "pagination/macro.njk" import pagination with context %}
 
 {% block content %}
-  {{ heading({ text: __("activitypub.activities"), level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
-
   {% if activities.length > 0 %}
     {% for activity in activities %}
       {{ card({

package/views/activitypub-compose.njk

@@ -3,12 +3,6 @@
 {% from "heading/macro.njk" import heading with context %}
 
 {% block readercontent %}
-  {{ heading({
-    text: title,
-    level: 1,
-    parent: { text: __("activitypub.reader.title"), href: mountPath + "/admin/reader" }
-  }) }}
-
   {# Reply context — show the post being replied to #}
   {% if replyContext %}
     <div class="ap-compose__context">

package/views/activitypub-dashboard.njk

@@ -7,8 +7,6 @@
 {% from "badge/macro.njk" import badge with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1 }) }}
-
   {{ cardGrid({ cardSize: "16rem", items: [
     {
       title: followerCount + " " + __("activitypub.followers"),

package/views/activitypub-featured-tags.njk

@@ -4,8 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
-
   {% if tags.length > 0 %}
     <table class="table">
       <thead>

package/views/activitypub-featured.njk

@@ -4,8 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
-
   {% if pinned.length > 0 %}
     <table class="table">
       <thead>

package/views/activitypub-followers.njk

@@ -6,8 +6,6 @@
 {% from "pagination/macro.njk" import pagination with context %}
 
 {% block content %}
-  {{ heading({ text: followerCount + " " + __("activitypub.followers"), level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
-
   {% if followers.length > 0 %}
     {% for follower in followers %}
       {{ card({

package/views/activitypub-following.njk

@@ -7,8 +7,6 @@
 {% from "pagination/macro.njk" import pagination with context %}
 
 {% block content %}
-  {{ heading({ text: followingCount + " " + __("activitypub.following"), level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
-
   {% if following.length > 0 %}
     {% for account in following %}
       {% if account.source === "import" %}

package/views/activitypub-migrate.njk

@@ -8,8 +8,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
-
   {% if result %}
     {{ notificationBanner({ type: result.type, text: result.text }) }}
   {% endif %}

package/views/activitypub-moderation.njk

@@ -4,12 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({
-    text: title,
-    level: 1,
-    parent: { text: __("activitypub.reader.title"), href: mountPath + "/admin/reader" }
-  }) }}
-
   {# Blocked actors #}
   <section class="ap-moderation__section">
     <h2>{{ __("activitypub.moderation.blockedTitle") }}</h2>

package/views/activitypub-notifications.njk

@@ -4,12 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({
-    text: __("activitypub.notifications.title"),
-    level: 1,
-    parent: { text: __("activitypub.reader.title"), href: mountPath + "/admin/reader" }
-  }) }}
-
   {% if items.length > 0 %}
     <div class="ap-notifications__toolbar">
       {% if unreadCount > 0 %}

package/views/activitypub-post-detail.njk

@@ -3,12 +3,6 @@
 {% from "heading/macro.njk" import heading with context %}
 
 {% block readercontent %}
-  {{ heading({
-    text: title,
-    level: 1,
-    parent: { text: __("activitypub.reader.title"), href: mountPath + "/admin/reader" }
-  }) }}
-
   <div class="ap-post-detail" data-mount-path="{{ mountPath }}">
     {# Back button #}
     <div class="ap-post-detail__back">

package/views/activitypub-profile.njk

@@ -10,8 +10,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block content %}
-  {{ heading({ text: title, level: 1, parent: { text: __("activitypub.title"), href: mountPath } }) }}
-
   {% if result %}
     {{ notificationBanner({ type: result.type, text: result.text }) }}
   {% endif %}

package/views/activitypub-reader.njk

@@ -4,17 +4,16 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({
-    text: __("activitypub.reader.title"),
-    level: 1,
-    parent: { text: __("activitypub.title"), href: mountPath }
-  }) }}
+  {# Fediverse lookup #}
+  <form action="{{ mountPath }}/admin/reader/resolve" method="get" class="ap-lookup">
+    <input type="text" name="q" class="ap-lookup__input"
+      placeholder="{{ __('activitypub.reader.resolve.placeholder') }}"
+      aria-label="{{ __('activitypub.reader.resolve.label') }}">
+    <button type="submit" class="ap-lookup__btn">{{ __("activitypub.reader.resolve.button") }}</button>
+  </form>
 
   {# Tab navigation #}
   <nav class="ap-tabs" role="tablist">
-    <a href="?tab=all" class="ap-tab{% if tab == 'all' %} ap-tab--active{% endif %}" role="tab">
-      {{ __("activitypub.reader.tabs.all") }}
-    </a>
     <a href="?tab=notes" class="ap-tab{% if tab == 'notes' %} ap-tab--active{% endif %}" role="tab">
       {{ __("activitypub.reader.tabs.notes") }}
     </a>
@@ -30,6 +29,9 @@
     <a href="?tab=media" class="ap-tab{% if tab == 'media' %} ap-tab--active{% endif %}" role="tab">
       {{ __("activitypub.reader.tabs.media") }}
     </a>
+    <a href="?tab=all" class="ap-tab{% if tab == 'all' %} ap-tab--active{% endif %}" role="tab">
+      {{ __("activitypub.reader.tabs.all") }}
+    </a>
   </nav>
 
   {# Timeline items #}

package/views/activitypub-remote-profile.njk

@@ -4,12 +4,6 @@
 {% from "prose/macro.njk" import prose with context %}
 
 {% block readercontent %}
-  {{ heading({
-    text: title,
-    level: 1,
-    parent: { text: __("activitypub.reader.title"), href: mountPath + "/admin/reader" }
-  }) }}
-
   <div class="ap-profile"
     x-data="{
       following: {{ 'true' if isFollowing else 'false' }},

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

@@ -24,8 +24,9 @@
   {# Author header #}
   <header class="ap-card__author">
     {% if item.author.photo %}
-      <img src="{{ item.author.photo }}" alt="{{ item.author.name }}" class="ap-card__avatar"
-        onerror="this.replaceWith(Object.assign(document.createElement('span'),{className:'ap-card__avatar ap-card__avatar--default',textContent:'{{ item.author.name[0] | upper if item.author.name else "?" }}'}))">
+      <img src="{{ item.author.photo }}" alt="{{ item.author.name }}" class="ap-card__avatar" loading="lazy" crossorigin="anonymous"
+        onerror="this.style.display='none';this.nextElementSibling.style.display=''">
+      <span class="ap-card__avatar ap-card__avatar--default" style="display:none" aria-hidden="true">{{ item.author.name[0] | upper if item.author.name else "?" }}</span>
     {% else %}
       <span class="ap-card__avatar ap-card__avatar--default" aria-hidden="true">{{ item.author.name[0] | upper if item.author.name else "?" }}</span>
     {% endif %}

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

@@ -8,19 +8,18 @@
     <button type="submit" class="ap-notification__dismiss-btn" title="{{ __('activitypub.notifications.dismiss') }}">&times;</button>
   </form>
 
-  {# Type icon #}
-  <div class="ap-notification__icon">
-    {% if item.type == "like" %}
-      ❤
-    {% elif item.type == "boost" %}
-      🔁
-    {% elif item.type == "follow" %}
-      👤
-    {% elif item.type == "reply" %}
-      💬
-    {% elif item.type == "mention" %}
-      @
+  {# Actor avatar with type badge #}
+  <div class="ap-notification__avatar-wrap">
+    {% if item.actorPhoto %}
+      <img src="{{ item.actorPhoto }}" alt="{{ item.actorName }}" class="ap-notification__avatar" loading="lazy" crossorigin="anonymous"
+        onerror="this.style.display='none';this.nextElementSibling.style.display=''">
+      <span class="ap-notification__avatar ap-notification__avatar--default" style="display:none" aria-hidden="true">{{ item.actorName[0] | upper if item.actorName else "?" }}</span>
+    {% else %}
+      <span class="ap-notification__avatar ap-notification__avatar--default" aria-hidden="true">{{ item.actorName[0] | upper if item.actorName else "?" }}</span>
     {% endif %}
+    <span class="ap-notification__type-badge">
+      {% if item.type == "like" %}❤{% elif item.type == "boost" %}🔁{% elif item.type == "follow" %}👤{% elif item.type == "reply" %}💬{% elif item.type == "mention" %}@{% endif %}
+    </span>
   </div>
 
   {# Notification body #}