Skip to content

Commit 32da15f

Browse files
committed
Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop
2 parents 8fccf69 + 97cd6e2 commit 32da15f

5 files changed

Lines changed: 236 additions & 21 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"dependencies": {
4444
"@adiwajshing/keyed-db": "^0.2.4",
4545
"@ffmpeg-installer/ffmpeg": "^1.1.0",
46-
"@figuro/chatwoot-sdk": "^1.1.14",
46+
"@figuro/chatwoot-sdk": "^1.1.16",
4747
"@hapi/boom": "^10.0.1",
4848
"@sentry/node": "^7.59.2",
4949
"@whiskeysockets/baileys": "^6.4.0",

src/config/env.config.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ export type Websocket = {
7070
ENABLED: boolean;
7171
};
7272

73+
export type Chatwoot = {
74+
USE_REPLY_ID: boolean;
75+
};
76+
7377
export type EventsWebhook = {
7478
APPLICATION_STARTUP: boolean;
7579
QRCODE_UPDATED: boolean;
@@ -139,6 +143,7 @@ export interface Env {
139143
QRCODE: QrCode;
140144
AUTHENTICATION: Auth;
141145
PRODUCTION?: Production;
146+
CHATWOOT?: Chatwoot;
142147
}
143148

144149
export type Key = keyof Env;
@@ -297,6 +302,9 @@ export class ConfigService {
297302
SECRET: process.env.AUTHENTICATION_JWT_SECRET || 'L=0YWt]b2w[WF>#>:&E`',
298303
},
299304
},
305+
CHATWOOT: {
306+
USE_REPLY_ID: process.env?.USE_REPLY_ID === 'true',
307+
},
300308
};
301309
}
302310
}

src/dev-env.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,7 @@ AUTHENTICATION:
154154
JWT:
155155
EXPIRIN_IN: 0 # seconds - 3600s === 1h | zero (0) - never expires
156156
SECRET: L=0YWt]b2w[WF>#>:&E`
157+
158+
# Configure to chatwoot
159+
CHATWOOT:
160+
USE_REPLY_ID: false

src/whatsapp/models/message.model.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export class MessageRaw {
2020
messageTimestamp?: number | Long.Long;
2121
owner: string;
2222
source?: 'android' | 'web' | 'ios';
23+
source_id?: string;
24+
source_reply_id?: string;
2325
}
2426

2527
const messageSchema = new Schema<MessageRaw>({

0 commit comments

Comments
 (0)