Skip to content

Commit d6e8210

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into bugfix/messaging-history-chats-return-remoteJid-invalid
# Conflicts: # src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
2 parents 636b9a8 + 6efa879 commit d6e8210

File tree

16 files changed

+622
-55
lines changed

16 files changed

+622
-55
lines changed

package-lock.json

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- AlterTable
2+
ALTER TABLE `Instance` MODIFY `token` VARCHAR(500);
3+

prisma/mysql-schema.prisma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ model Instance {
7070
integration String? @db.VarChar(100)
7171
number String? @db.VarChar(100)
7272
businessId String? @db.VarChar(100)
73-
token String? @db.VarChar(255)
73+
token String? @db.VarChar(500)
7474
clientName String? @db.VarChar(100)
7575
disconnectionReasonCode Int? @db.Int
7676
disconnectionObject Json? @db.Json
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- AlterTable
2+
ALTER TABLE "Instance" ALTER COLUMN "token" TYPE VARCHAR(500);
3+

prisma/postgresql-schema.prisma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ model Instance {
7070
integration String? @db.VarChar(100)
7171
number String? @db.VarChar(100)
7272
businessId String? @db.VarChar(100)
73-
token String? @db.VarChar(255)
73+
token String? @db.VarChar(500)
7474
clientName String? @db.VarChar(100)
7575
disconnectionReasonCode Int? @db.Integer
7676
disconnectionObject Json? @db.JsonB

prisma/psql_bouncer-schema.prisma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ model Instance {
7171
integration String? @db.VarChar(100)
7272
number String? @db.VarChar(100)
7373
businessId String? @db.VarChar(100)
74-
token String? @db.VarChar(255)
74+
token String? @db.VarChar(500)
7575
clientName String? @db.VarChar(100)
7676
disconnectionReasonCode Int? @db.Integer
7777
disconnectionObject Json? @db.JsonB

src/api/controllers/chat.controller.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
ArchiveChatDto,
33
BlockUserDto,
4+
DecryptPollVoteDto,
45
DeleteMessage,
56
getBase64FromMediaMessageDto,
67
MarkChatUnreadDto,
@@ -113,4 +114,16 @@ export class ChatController {
113114
public async blockUser({ instanceName }: InstanceDto, data: BlockUserDto) {
114115
return await this.waMonitor.waInstances[instanceName].blockUser(data);
115116
}
117+
118+
public async decryptPollVote({ instanceName }: InstanceDto, data: DecryptPollVoteDto) {
119+
const pollCreationMessageKey = {
120+
id: data.message.key.id,
121+
remoteJid: data.remoteJid,
122+
};
123+
return await this.waMonitor.waInstances[instanceName].baileysDecryptPollVote(pollCreationMessageKey);
124+
}
125+
126+
public async fetchChannels({ instanceName }: InstanceDto, query: Query<Contact>) {
127+
return await this.waMonitor.waInstances[instanceName].fetchChannels(query);
128+
}
116129
}

src/api/dto/chat.dto.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,12 @@ export class BlockUserDto {
127127
number: string;
128128
status: 'block' | 'unblock';
129129
}
130+
131+
export class DecryptPollVoteDto {
132+
message: {
133+
key: {
134+
id: string;
135+
};
136+
};
137+
remoteJid: string;
138+
}

0 commit comments

Comments
 (0)