@rmdes/indiekit-endpoint-activitypub 2.9.0 → 2.9.2

package/assets/reader.css

@@ -1374,6 +1374,7 @@
 
 .ap-messages__partner--active {
   background: var(--color-offset);
+  border-left: 3px solid var(--color-primary);
   font-weight: var(--font-weight-bold);
 }
 
@@ -1388,12 +1389,15 @@
   border-radius: 50%;
   height: 100%;
   object-fit: cover;
+  position: absolute;
+  inset: 0;
   width: 100%;
+  z-index: 1;
 }
 
 .ap-messages__partner-initial {
   align-items: center;
-  background: var(--color-offset);
+  background: var(--color-offset-variant);
   border-radius: 50%;
   color: var(--color-on-offset);
   display: flex;
@@ -1403,10 +1407,6 @@
   width: 100%;
 }
 
-.ap-messages__partner-avatar img + .ap-messages__partner-initial {
-  display: none;
-}
-
 .ap-messages__partner-info {
   display: flex;
   flex-direction: column;
@@ -1434,7 +1434,11 @@
 }
 
 .ap-message--outbound {
-  border-left-color: var(--color-primary);
+  border-left: 3px solid var(--color-primary);
+}
+
+.ap-message .ap-notification__time {
+  padding-right: var(--space-l);
 }
 
 .ap-message__direction {
@@ -1458,6 +1462,17 @@
   margin-bottom: 0;
 }
 
+/* Inline mention links in DM content (Mastodon wraps @user in span inside a link) */
+.ap-message__content .h-card,
+.ap-message__content a.mention,
+.ap-message__content a span {
+  display: inline;
+}
+
+.ap-message__content a {
+  overflow-wrap: break-word;
+}
+
 @media (max-width: 640px) {
   .ap-messages__layout {
     grid-template-columns: 1fr;

package/lib/controllers/messages.js

@@ -37,11 +37,13 @@ export function messagesController(mountPath) {
         options.partner = partner;
       }
 
-      // Get messages + conversation partners + unread count in parallel
-      const [result, partners, unreadCount] = await Promise.all([
+      // Get messages + conversation partners + unread count + our profile in parallel
+      const profileCol = application?.collections?.get("ap_profile");
+      const [result, partners, unreadCount, myProfile] = await Promise.all([
         getMessages(collections, options),
         getConversationPartners(collections),
         getUnreadMessageCount(collections),
+        profileCol ? profileCol.findOne({}) : null,
       ]);
 
       // Auto mark-read when viewing a specific conversation
@@ -59,6 +61,7 @@ export function messagesController(mountPath) {
         partners,
         activePartner: partner,
         unreadCount,
+        myProfile,
         csrfToken,
         mountPath,
       });
@@ -259,7 +262,7 @@ export function submitMessageController(mountPath, plugin) {
         uid: noteId,
         actorUrl: recipient.id.href,
         actorName: recipientName,
-        actorPhoto: recipient.iconUrl?.href || "",
+        actorPhoto: recipient.iconUrl?.href || recipient.icon?.url?.href || "",
         actorHandle: recipientHandle,
         content: {
           text: content.trim(),

package/lib/storage/messages.js

@@ -101,12 +101,13 @@ export async function getConversationPartners(collections) {
   const { ap_messages } = collections;
 
   const pipeline = [
+    { $sort: { published: -1 } },
     {
       $group: {
         _id: "$conversationId",
-        actorName: { $last: "$actorName" },
-        actorPhoto: { $last: "$actorPhoto" },
-        actorHandle: { $last: "$actorHandle" },
+        actorName: { $first: "$actorName" },
+        actorPhoto: { $max: "$actorPhoto" },
+        actorHandle: { $first: "$actorHandle" },
         lastMessage: { $max: "$published" },
         unreadCount: {
           $sum: { $cond: [{ $eq: ["$read", false] }, 1, 0] },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "2.9.0",
+  "version": "2.9.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/partials/ap-message-card.njk

@@ -1,6 +1,6 @@
 {# Message card partial — inbound/outbound DM display #}
 
-<div class="ap-notification{% if not item.read %} ap-notification--unread{% endif %}{% if item.direction == 'outbound' %} ap-message--outbound{% endif %}">
+<div class="ap-notification ap-message{% if not item.read %} ap-notification--unread{% endif %}{% if item.direction == 'outbound' %} ap-message--outbound{% endif %}">
   {# Dismiss button #}
   <form method="post" action="{{ mountPath }}/admin/reader/messages/delete" class="ap-notification__dismiss">
     <input type="hidden" name="_csrf" value="{{ csrfToken }}">
@@ -8,12 +8,17 @@
     <button type="submit" class="ap-notification__dismiss-btn" title="{{ __('activitypub.messages.delete') }}">&times;</button>
   </form>
 
-  {# Actor avatar with direction badge #}
+  {# Avatar — outbound: our profile photo, inbound: sender's photo #}
   <div class="ap-notification__avatar-wrap" data-avatar-fallback>
-    {% if item.actorPhoto %}
-    <img src="{{ item.actorPhoto }}" alt="{{ item.actorName }}" class="ap-notification__avatar" loading="lazy" crossorigin="anonymous">
+    {% if item.direction == "outbound" and myProfile and myProfile.icon %}
+      <img src="{{ myProfile.icon }}" alt="{{ myProfile.name or 'Me' }}" class="ap-notification__avatar" loading="lazy" crossorigin="anonymous">
+      <span class="ap-notification__avatar ap-notification__avatar--default" aria-hidden="true">{{ (myProfile.name or "M")[0] | upper }}</span>
+    {% else %}
+      {% if item.actorPhoto %}
+      <img src="{{ item.actorPhoto }}" alt="{{ item.actorName }}" class="ap-notification__avatar" loading="lazy" crossorigin="anonymous">
+      {% endif %}
+      <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__avatar ap-notification__avatar--default" aria-hidden="true">{{ item.actorName[0] | upper if item.actorName else "?" }}</span>
     <span class="ap-notification__type-badge">
       {% if item.direction == "outbound" %}↗{% else %}✉{% endif %}
     </span>