Skip to content

Commit d3ee370

Browse files
committed
feat(channel): enhance pushName logic for messages
- Updated the pushName selection to differentiate between group and individual messages. - Added conditional logic to display the chat name for group messages and the sender's name for individual messages.
1 parent 0b33a76 commit d3ee370

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/api/services/channel.service.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,10 @@ export class ChannelStartupService {
718718
SELECT DISTINCT ON ("Message"."key"->>'remoteJid')
719719
"Contact"."id" as "contactId",
720720
"Message"."key"->>'remoteJid' as "remoteJid",
721-
COALESCE("Contact"."pushName", "Message"."pushName") as "pushName",
721+
CASE
722+
WHEN "Message"."key"->>'remoteJid' LIKE '%@g.us' THEN COALESCE("Chat"."name", "Contact"."pushName")
723+
ELSE COALESCE("Contact"."pushName", "Message"."pushName")
724+
END as "pushName",
722725
"Contact"."profilePicUrl",
723726
COALESCE(
724727
to_timestamp("Message"."messageTimestamp"::double precision),
@@ -730,7 +733,10 @@ export class ChannelStartupService {
730733
CASE WHEN "Chat"."createdAt" + INTERVAL '24 hours' > NOW() THEN true ELSE false END as "windowActive",
731734
"Message"."id" AS lastMessageId,
732735
"Message"."key" AS lastMessage_key,
733-
"Message"."pushName" AS lastMessagePushName,
736+
CASE
737+
WHEN "Message"."key"->>'fromMe' = 'true' THEN 'Você'
738+
ELSE "Message"."pushName"
739+
END AS lastMessagePushName,
734740
"Message"."participant" AS lastMessageParticipant,
735741
"Message"."messageType" AS lastMessageMessageType,
736742
"Message"."message" AS lastMessageMessage,

0 commit comments

Comments
 (0)