Skip to content

Commit 7f6553e

Browse files
authored
Merge branch 'EvolutionAPI:develop' into develop
2 parents 0a04fb3 + 7cccda1 commit 7f6553e

5 files changed

Lines changed: 13 additions & 5 deletions

File tree

prisma/mysql-schema.prisma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ model IntegrationSession {
399399

400400
model Media {
401401
id String @id @default(cuid())
402-
fileName String @unique @db.VarChar(500)
402+
fileName String @db.VarChar(500)
403403
type String @db.VarChar(100)
404404
mimetype String @db.VarChar(100)
405405
createdAt DateTime? @default(dbgenerated("CURRENT_TIMESTAMP")) @db.Timestamp
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- DropIndex
2+
DROP INDEX "Media_fileName_key";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Please do not edit this file manually
2-
# It should be added in your version-control system (i.e. Git)
2+
# It should be added in your version-control system (e.g., Git)
33
provider = "postgresql"

prisma/postgresql-schema.prisma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ model TypebotSetting {
383383

384384
model Media {
385385
id String @id @default(cuid())
386-
fileName String @unique @db.VarChar(500)
386+
fileName String @db.VarChar(500)
387387
type String @db.VarChar(100)
388388
mimetype String @db.VarChar(100)
389389
createdAt DateTime? @default(now()) @db.Date

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)