mirror of
https://github.com/EvolutionAPI/evolution-api.git
synced 2025-07-16 12:12:55 -06:00
Added unreadMessages to chats
This commit is contained in:
parent
49edd174a9
commit
edb3875b91
@ -123,6 +123,7 @@ model Chat {
|
|||||||
updatedAt DateTime? @updatedAt @db.Timestamp
|
updatedAt DateTime? @updatedAt @db.Timestamp
|
||||||
Instance Instance @relation(fields: [instanceId], references: [id], onDelete: Cascade)
|
Instance Instance @relation(fields: [instanceId], references: [id], onDelete: Cascade)
|
||||||
instanceId String
|
instanceId String
|
||||||
|
unreadMessages Int @default(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
model Contact {
|
model Contact {
|
||||||
|
@ -661,6 +661,7 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
instanceId: this.instanceId,
|
instanceId: this.instanceId,
|
||||||
remoteJid: chat.id,
|
remoteJid: chat.id,
|
||||||
name: chat.name,
|
name: chat.name,
|
||||||
|
unreadMessages: typeof chat.unreadCount === 'number' ? chat.unreadCount : 0,
|
||||||
},
|
},
|
||||||
data: { remoteJid: chat.id },
|
data: { remoteJid: chat.id },
|
||||||
});
|
});
|
||||||
@ -1231,6 +1232,8 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
},
|
},
|
||||||
|
|
||||||
'messages.update': async (args: WAMessageUpdate[], settings: any) => {
|
'messages.update': async (args: WAMessageUpdate[], settings: any) => {
|
||||||
|
const unreadChatToUpdate: Record<string, number> = {}; // {remoteJid: readedMessages}
|
||||||
|
|
||||||
for await (const { key, update } of args) {
|
for await (const { key, update } of args) {
|
||||||
if (settings?.groupsIgnore && key.remoteJid?.includes('@g.us')) {
|
if (settings?.groupsIgnore && key.remoteJid?.includes('@g.us')) {
|
||||||
return;
|
return;
|
||||||
@ -1273,7 +1276,7 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status[update.status] === 'READ' && !key.fromMe) return;
|
//if (status[update.status] === 'READ' && !key.fromMe) return;
|
||||||
|
|
||||||
if (update.message === null && update.status === undefined) {
|
if (update.message === null && update.status === undefined) {
|
||||||
this.sendDataWebhook(Events.MESSAGES_DELETE, key);
|
this.sendDataWebhook(Events.MESSAGES_DELETE, key);
|
||||||
@ -1302,6 +1305,17 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
} else if (update.message !== undefined && update.message !== findMessage.status) {
|
||||||
|
if (unreadChatToUpdate[key.remoteJid!] === undefined) {
|
||||||
|
unreadChatToUpdate[key.remoteJid!] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
unreadChatToUpdate[key.remoteJid!]++;
|
||||||
|
|
||||||
|
this.prismaRepository.message.update({
|
||||||
|
where: { id: findMessage.id },
|
||||||
|
data: { status: status[update.status] },
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const message: any = {
|
const message: any = {
|
||||||
@ -1323,6 +1337,17 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for await (const [remoteJid, unreadMessages] of Object.entries(unreadChatToUpdate)) {
|
||||||
|
const chat = await this.prismaRepository.chat.findFirst({ where: { remoteJid } });
|
||||||
|
|
||||||
|
if (chat) {
|
||||||
|
this.prismaRepository.chat.update({
|
||||||
|
where: { id: chat.id },
|
||||||
|
data: { unreadMessages: Math.max(0, chat.unreadMessages - unreadMessages) },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -2006,7 +2031,13 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
|
|
||||||
const mimetype = mime.getType(fileName).toString();
|
const mimetype = mime.getType(fileName).toString();
|
||||||
|
|
||||||
const fullName = join(`${this.instance.id}`, messageRaw.key.remoteJid, `${messageRaw.key.id}`, mediaType, fileName);
|
const fullName = join(
|
||||||
|
`${this.instance.id}`,
|
||||||
|
messageRaw.key.remoteJid,
|
||||||
|
`${messageRaw.key.id}`,
|
||||||
|
mediaType,
|
||||||
|
fileName,
|
||||||
|
);
|
||||||
|
|
||||||
await s3Service.uploadFile(fullName, buffer, size.fileLength?.low, {
|
await s3Service.uploadFile(fullName, buffer, size.fileLength?.low, {
|
||||||
'Content-Type': mimetype,
|
'Content-Type': mimetype,
|
||||||
|
@ -626,6 +626,7 @@ export class ChannelStartupService {
|
|||||||
"Chat"."updatedAt",
|
"Chat"."updatedAt",
|
||||||
"Contact"."pushName",
|
"Contact"."pushName",
|
||||||
"Contact"."profilePicUrl"
|
"Contact"."profilePicUrl"
|
||||||
|
"Contact"."unreadMessages"
|
||||||
FROM "Chat"
|
FROM "Chat"
|
||||||
INNER JOIN "Message" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid'
|
INNER JOIN "Message" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid'
|
||||||
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
|
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
|
||||||
@ -639,7 +640,8 @@ export class ChannelStartupService {
|
|||||||
"Chat"."createdAt",
|
"Chat"."createdAt",
|
||||||
"Chat"."updatedAt",
|
"Chat"."updatedAt",
|
||||||
"Contact"."pushName",
|
"Contact"."pushName",
|
||||||
"Contact"."profilePicUrl"
|
"Contact"."profilePicUrl",
|
||||||
|
"Contact"."unreadMessages"
|
||||||
ORDER BY "Chat"."updatedAt" DESC;
|
ORDER BY "Chat"."updatedAt" DESC;
|
||||||
`;
|
`;
|
||||||
} else {
|
} else {
|
||||||
@ -653,6 +655,7 @@ export class ChannelStartupService {
|
|||||||
"Chat"."updatedAt",
|
"Chat"."updatedAt",
|
||||||
"Contact"."pushName",
|
"Contact"."pushName",
|
||||||
"Contact"."profilePicUrl"
|
"Contact"."profilePicUrl"
|
||||||
|
"Contact"."unreadMessages"
|
||||||
FROM "Chat"
|
FROM "Chat"
|
||||||
INNER JOIN "Message" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid'
|
INNER JOIN "Message" ON "Chat"."remoteJid" = "Message"."key"->>'remoteJid'
|
||||||
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
|
LEFT JOIN "Contact" ON "Chat"."remoteJid" = "Contact"."remoteJid"
|
||||||
@ -666,6 +669,7 @@ export class ChannelStartupService {
|
|||||||
"Chat"."updatedAt",
|
"Chat"."updatedAt",
|
||||||
"Contact"."pushName",
|
"Contact"."pushName",
|
||||||
"Contact"."profilePicUrl"
|
"Contact"."profilePicUrl"
|
||||||
|
"Contact"."unreadMessages"
|
||||||
ORDER BY "Chat"."updatedAt" DESC;
|
ORDER BY "Chat"."updatedAt" DESC;
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user