Skip to content

Commit d6caf9b

Browse files
authored
fix(channel): remove duplicated pushName alias and prefer Contact.pushName in fetchChats (#2460)
* refactor(channel): remove unused pushName field * refactor(channel): simplify pushName assignment logic * fix(channel): remove Message.pushName fallback from MySQL CASE query * fix(channel): remove duplicated pushName alias and prefer Contact.pushName in fetchChats
1 parent 1d38d4f commit d6caf9b

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

src/api/services/channel.service.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ export class ChannelStartupService {
752752
JSON_UNQUOTE(JSON_EXTRACT(Message.key, '$.remoteJid')) as remoteJid,
753753
CASE
754754
WHEN JSON_UNQUOTE(JSON_EXTRACT(Message.key, '$.remoteJid')) LIKE '%@g.us' THEN COALESCE(Chat.name, Contact.pushName)
755-
ELSE COALESCE(Contact.pushName, Message.pushName)
755+
ELSE Contact.pushName
756756
END as pushName,
757757
Contact.profilePicUrl,
758758
COALESCE(
@@ -811,14 +811,13 @@ export class ChannelStartupService {
811811
"Message"."key"->>'remoteJid' as "remoteJid",
812812
CASE
813813
WHEN "Message"."key"->>'remoteJid' LIKE '%@g.us' THEN COALESCE("Chat"."name", "Contact"."pushName")
814-
ELSE COALESCE("Contact"."pushName", "Message"."pushName")
814+
ELSE "Contact"."pushName"
815815
END as "pushName",
816816
"Contact"."profilePicUrl",
817817
COALESCE(
818818
to_timestamp("Message"."messageTimestamp"::double precision),
819819
"Contact"."updatedAt"
820820
) as "updatedAt",
821-
"Chat"."name" as "pushName",
822821
"Chat"."createdAt" as "windowStart",
823822
"Chat"."createdAt" + INTERVAL '24 hours' as "windowExpires",
824823
"Chat"."unreadMessages" as "unreadMessages",

0 commit comments

Comments
 (0)