Merge tag '0.7.1'

Hollo 0.7.1

Author: dahlia

CHANGES.md

@@ -42,6 +42,20 @@ To be released.
 [#350]: https://github.com/fedify-dev/hollo/issues/350
 
 
+Version 0.7.1
+-------------
+
+Released on February 4, 2026.
+
+ -  Fixed emoji reaction notifications not displaying emoji information in
+    Mastodon-compatible clients. The `/api/v1/notifications` endpoint now
+    includes top-level `emoji` and `emoji_url` fields for `emoji_reaction`
+    notifications, compatible with Pleroma/Akkoma clients like Phanpy.
+    [[#358]]
+
+[#358]: https://github.com/fedify-dev/hollo/issues/358
+
+
 Version 0.7.0
 -------------
 

src/api/v1/notifications.test.ts

@@ -364,4 +364,136 @@ describe.sequential("/api/v1/notifications", () => {
       expect(body).toHaveLength(0);
     });
   });
+
+  describe("Emoji reaction notifications", () => {
+    it("includes emoji in emoji_reaction notifications", async () => {
+      expect.assertions(5);
+
+      const accessToken = await getAccessToken(client, account, [
+        "read:notifications",
+      ]);
+
+      // Create a post by the local user
+      const postId = crypto.randomUUID() as Uuid;
+      const postIri = `https://test.local/@test/${postId}`;
+      await db.insert(Schema.posts).values({
+        id: postId,
+        iri: postIri,
+        type: "Note",
+        accountId: account.id as Uuid,
+        visibility: "public",
+        contentHtml: "Test post",
+        content: "Test post",
+        url: postIri,
+      });
+
+      // Create an emoji reaction from remote account
+      const emoji = "😊";
+      await db.insert(Schema.reactions).values({
+        postId,
+        accountId: remoteAccount.id,
+        emoji,
+        customEmoji: null,
+        emojiIri: null,
+      });
+
+      // Create emoji_reaction notification
+      await db.insert(Schema.notifications).values({
+        id: crypto.randomUUID() as Uuid,
+        accountOwnerId: account.id as Uuid,
+        type: "emoji_reaction",
+        actorAccountId: remoteAccount.id,
+        targetPostId: postId,
+        groupKey: `test-emoji-reaction-${postId}`,
+        created: new Date(),
+      });
+
+      const response = await app.request(
+        "/api/v1/notifications?types[]=emoji_reaction",
+        {
+          method: "GET",
+          headers: {
+            authorization: bearerAuthorization(accessToken),
+          },
+        },
+      );
+
+      expect(response.status).toBe(200);
+
+      const notifications = await response.json();
+      expect(notifications.length).toBe(1);
+
+      const notification = notifications[0];
+      expect(notification.type).toBe("emoji_reaction");
+      expect(notification.emoji_reaction).toBeDefined();
+      expect(notification.emoji_reaction.name).toBe(emoji);
+    });
+
+    it("handles custom emoji in emoji_reaction notifications", async () => {
+      expect.assertions(6);
+
+      const accessToken = await getAccessToken(client, account, [
+        "read:notifications",
+      ]);
+
+      // Create a post by the local user
+      const postId = crypto.randomUUID() as Uuid;
+      const postIri = `https://test.local/@test/${postId}`;
+      await db.insert(Schema.posts).values({
+        id: postId,
+        iri: postIri,
+        type: "Note",
+        accountId: account.id as Uuid,
+        visibility: "public",
+        contentHtml: "Test post",
+        content: "Test post",
+        url: postIri,
+      });
+
+      // Create a custom emoji reaction from remote account
+      const emojiName = ":custom_emoji:";
+      const emojiUrl = "https://remote.test/emoji/custom_emoji.png";
+      const emojiIri = "https://remote.test/emoji/custom_emoji";
+
+      await db.insert(Schema.reactions).values({
+        postId,
+        accountId: remoteAccount.id,
+        emoji: emojiName,
+        customEmoji: emojiUrl,
+        emojiIri: emojiIri,
+      });
+
+      // Create emoji_reaction notification
+      await db.insert(Schema.notifications).values({
+        id: crypto.randomUUID() as Uuid,
+        accountOwnerId: account.id as Uuid,
+        type: "emoji_reaction",
+        actorAccountId: remoteAccount.id,
+        targetPostId: postId,
+        groupKey: `test-custom-emoji-${postId}`,
+        created: new Date(),
+      });
+
+      const response = await app.request(
+        "/api/v1/notifications?types[]=emoji_reaction",
+        {
+          method: "GET",
+          headers: {
+            authorization: bearerAuthorization(accessToken),
+          },
+        },
+      );
+
+      expect(response.status).toBe(200);
+
+      const notifications = await response.json();
+      expect(notifications.length).toBe(1);
+
+      const notification = notifications[0];
+      expect(notification.type).toBe("emoji_reaction");
+      expect(notification.emoji_reaction).toBeDefined();
+      expect(notification.emoji_reaction.name).toBe("custom_emoji");
+      expect(notification.emoji_reaction.url).toBe(emojiUrl);
+    });
+  });
 });

src/api/v1/notifications.ts

@@ -20,6 +20,7 @@ import {
   polls,
   pollVotes,
   posts,
+  reactions,
 } from "../../schema";
 import type { Uuid } from "../../uuid";
 
@@ -173,6 +174,48 @@ app.get(
       count: notificationsData.length,
     });
 
+    // Fetch emoji reactions for emoji_reaction notifications
+    const emojiReactionNotifications = notificationsData.filter(
+      (n) =>
+        n.type === "emoji_reaction" &&
+        n.targetPostId != null &&
+        n.actorAccount != null,
+    );
+
+    // Fetch reactions from DB
+    const reactionsData =
+      emojiReactionNotifications.length > 0
+        ? await db.query.reactions.findMany({
+            where: or(
+              ...emojiReactionNotifications.map((n) =>
+                and(
+                  eq(reactions.postId, n.targetPostId!),
+                  eq(reactions.accountId, n.actorAccount!.id),
+                ),
+              ),
+            ),
+            with: {
+              account: { with: { owner: true, successor: true } },
+            },
+          })
+        : [];
+
+    // Build map: "postId:accountId" -> Reaction
+    const reactionsMap = new Map<string, (typeof reactionsData)[number]>();
+    for (const reaction of reactionsData) {
+      const mapKey = `${reaction.postId}:${reaction.accountId}`;
+      reactionsMap.set(mapKey, reaction);
+    }
+
+    if (reactionsData.length > 0) {
+      logger.debug(
+        "Fetched {count} emoji reactions for emoji_reaction notifications",
+        {
+          count: reactionsData.length,
+        },
+      );
+    }
+
     // Query poll expiry notifications dynamically (not stored in DB)
     type StoredNotification = (typeof notificationsData)[number];
     type PollNotification = {
@@ -321,7 +364,7 @@ app.get(
           });
           return null;
         }
-        return {
+        const result: Record<string, unknown> = {
           id: `${created_at}/${n.type}/${n.id}`,
           type: n.type,
           created_at,
@@ -338,23 +381,42 @@ app.get(
           status: n.targetPost
             ? serializePost(n.targetPost, owner, c.req.url)
             : null,
-          ...(n.type === "emoji_reaction" && n.targetPost && account
-            ? {
-                emoji_reaction: serializeReaction(
-                  {
-                    postId: n.targetPost.id,
-                    accountId: account.id,
-                    account,
-                    emoji: "", // Will be fetched from reactions table if needed
-                    customEmoji: null,
-                    emojiIri: null,
-                    created: n.created,
-                  },
-                  owner,
-                ),
-              }
-            : {}),
         };
+
+        // Add emoji and emoji_url fields for emoji_reaction notifications
+        // These fields are used by clients like Phanpy, Misskey, Pleroma
+        if (n.type === "emoji_reaction" && n.targetPost && account != null) {
+          const mapKey = `${n.targetPost.id}:${account.id}`;
+          const reaction = reactionsMap.get(mapKey);
+
+          if (reaction != null) {
+            // Add top-level emoji and emoji_url fields for client compatibility
+            result.emoji = reaction.emoji;
+            if (reaction.customEmoji != null) {
+              result.emoji_url = reaction.customEmoji;
+              // Also add camelCase variant for Phanpy compatibility (Phanpy bug workaround)
+              result.emojiURL = reaction.customEmoji;
+            }
+
+            // Also include emoji_reaction object for Mastodon-compatible clients
+            result.emoji_reaction = serializeReaction(reaction, owner);
+          } else {
+            // Fallback: reaction not found (deleted)
+            logger.warn(
+              "Reaction not found for emoji_reaction notification {notifId}",
+              { notifId: n.id },
+            );
+            result.emoji = "";
+            result.emoji_reaction = {
+              name: "",
+              count: 1,
+              me: false,
+              account_ids: [account.id],
+            };
+          }
+        }
+
+        return result;
       })
       .filter((n) => n != null);