@automagik/omni 2.260910.12 → 2.260910.13

package/dist/index.js

@@ -137198,7 +137198,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260910.12",
+  version: "2.260910.13",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",

package/dist/server/index.js

@@ -251645,7 +251645,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.12",
+    version: "2.260910.13",
     private: true,
     type: "module",
     exports: {
@@ -363797,6 +363797,19 @@ async function postProcessChat(services, chat2, _chatCreated, chatExternalId, ch
 function resolveSenderDisplayName(senderName, rawPayload, participantResult) {
   return truncate4(senderName ?? rawPayload?.pushName, 255) || participantResult?.participant.displayName || undefined;
 }
+async function resolveQuotedSenderName(services, chatId, quotedMessage) {
+  const pushName = truncate4(quotedMessage?.pushName, 255);
+  if (pushName)
+    return pushName;
+  const participant = quotedMessage?.participant;
+  if (!participant)
+    return;
+  const platformUserId = participant.split("@")[0]?.split(":")[0];
+  if (!platformUserId)
+    return;
+  const existing = await services.chats.findParticipant(chatId, platformUserId);
+  return truncate4(existing?.displayName ?? undefined, 255);
+}
 async function maybeFindOrCreateParticipant(services, chatId, from, rawPayload, personId, platformIdentityId, senderName) {
   if (!from)
     return;
@@ -363956,7 +363969,7 @@ async function handleMessageReceived(services, payload, metadata, eventTimestamp
     mediaLocalPath: rawPayload?.mediaLocalPath,
     replyToExternalId: truncate4(payload.replyToId, 255),
     quotedText: quotedMessage?.conversation,
-    quotedSenderName: truncate4(quotedMessage?.pushName, 255),
+    quotedSenderName: await resolveQuotedSenderName(services, chat2.id, quotedMessage),
     threadExternalId: truncate4(payload.threadId, 255),
     isThreadBroadcast: rawPayload?.isThreadBroadcast === true,
     isForwarded: !!(rawPayload?.isForwarded || rawPayload?.forwardingScore),
@@ -370062,8 +370075,12 @@ class ChatService {
     }).where(eq(chatParticipants.id, existing.id)).returning();
     return updated ?? existing;
   }
-  async findOrCreateParticipant(chatId, platformUserId, defaults2 = {}) {
+  async findParticipant(chatId, platformUserId) {
     const [existing] = await this.db.select().from(chatParticipants).where(and2(eq(chatParticipants.chatId, chatId), eq(chatParticipants.platformUserId, platformUserId))).limit(1);
+    return existing;
+  }
+  async findOrCreateParticipant(chatId, platformUserId, defaults2 = {}) {
+    const existing = await this.findParticipant(chatId, platformUserId);
     if (existing) {
       const hasNewIdentity = defaults2.personId || defaults2.platformIdentityId;
       const missingIdentity = !existing.personId || !existing.platformIdentityId;
@@ -398043,6 +398060,16 @@ async function resolveChatLink(db2, instanceId, chatId) {
     return NO_CHAT_LINK;
   }
 }
+async function resolveReplyToEventId(db2, instanceId, replyToExternalId) {
+  if (!instanceId || !replyToExternalId)
+    return null;
+  try {
+    const [row] = await db2.select({ id: omniEvents.id }).from(omniEvents).where(and2(eq(omniEvents.instanceId, instanceId), eq(omniEvents.externalId, replyToExternalId))).orderBy(omniEvents.receivedAt).limit(1);
+    return row?.id ?? null;
+  } catch {
+    return null;
+  }
+}
 async function resolvePersonId2(db2, candidate) {
   if (typeof candidate !== "string" || !isValidUuid(candidate))
     return null;
@@ -398077,6 +398104,7 @@ async function setupEventPersistence(eventBus, db2) {
         await runConsumerInTenantContext(db2, event, async () => {
           const sdb = scopedHandle(db2);
           const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
+          const replyToEventId = await resolveReplyToEventId(sdb, metadata.instanceId, payload.replyToId);
           const columns2 = {
             externalId: payload.externalId,
             channel: mapChannelType(metadata.channelType),
@@ -398091,6 +398119,7 @@ async function setupEventPersistence(eventBus, db2) {
             mediaMimeType: payload.content.mimeType,
             chatId: payload.chatId,
             replyToExternalId: payload.replyToId,
+            replyToEventId,
             status: "received",
             receivedAt: new Date(event.timestamp),
             rawPayload: payload.rawPayload ? deepSanitize(payload.rawPayload) : undefined,
@@ -398127,6 +398156,7 @@ async function setupEventPersistence(eventBus, db2) {
         await runConsumerInTenantContext(db2, event, async () => {
           const sdb = scopedHandle(db2);
           const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
+          const replyToEventId = await resolveReplyToEventId(sdb, metadata.instanceId, payload.replyToId);
           const newEvent = {
             ...eventIdInsert(event.id),
             externalId: payload.externalId,
@@ -398142,6 +398172,7 @@ async function setupEventPersistence(eventBus, db2) {
             mediaMimeType: payload.content.mimeType,
             chatId: payload.chatId,
             replyToExternalId: payload.replyToId,
+            replyToEventId,
             status: "completed",
             receivedAt: new Date(event.timestamp),
             processedAt: new Date,
@@ -528591,6 +528622,19 @@ function getReplyToId2(msg) {
   const contextInfo = getMessageContextInfo(msg);
   return contextInfo?.stanzaId || undefined;
 }
+function extractQuotedContext(msg) {
+  const contextInfo = getMessageContextInfo(msg);
+  if (!contextInfo?.quotedMessage)
+    return;
+  const content = extractContent3({ key: msg.key, message: contextInfo.quotedMessage });
+  const type = content?.type ?? "unknown";
+  return {
+    stanzaId: contextInfo.stanzaId || undefined,
+    participant: contextInfo.participant || undefined,
+    type,
+    conversation: content?.text || content?.caption || `[${type}]`
+  };
+}
 function isFromMe(msg) {
   return msg.key.fromMe === true;
 }
@@ -531691,6 +531735,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
         }
       } catch {}
     }
+    await this.enrichPayloadWithQuotedMessage(extendedPayload, instanceId, chatId, rawMessage);
     if (content.poll)
       extendedPayload.poll = content.poll;
     if (content.pollVotes)
@@ -532223,6 +532268,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
       if (content.localPath)
         rawPayload.mediaLocalPath = content.localPath;
       this.enrichPayloadWithChatName(rawPayload, instanceId, chatId);
+      await this.enrichPayloadWithQuotedMessage(rawPayload, instanceId, chatId, msg);
       const historySenderName = msg.pushName ?? undefined;
       await this.emitMessageReceived({
         instanceId,
@@ -532242,6 +532288,13 @@ class WhatsAppPlugin extends BaseChannelPlugin {
       });
     }
   }
+  async enrichPayloadWithQuotedMessage(rawPayload, instanceId, chatId, msg) {
+    const quoted = extractQuotedContext(msg);
+    if (!quoted)
+      return;
+    const pushName = quoted.participant ? (await this.getContactInfo(instanceId, quoted.participant, chatId))?.name : undefined;
+    rawPayload.quotedMessage = { ...quoted, pushName };
+  }
   enrichPayloadWithChatName(payload, instanceId, chatId) {
     if (chatId.includes("@g.us")) {
       const group = this.groupsCache.get(instanceId)?.get(chatId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260910.12",
+  "version": "2.260910.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",