Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NEW] Enable twilio whatsapp template #1391

Merged
merged 14 commits into from
Sep 6, 2023
Merged

[NEW] Enable twilio whatsapp template #1391

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dd30ee4
Enable twilio whatsapp template
bhardwajaditya Aug 2, 2023
aa620a5
Stringify content variables in payload
bhardwajaditya Aug 2, 2023
3aa04a6
Fix contentVariables param value
bhardwajaditya Aug 2, 2023
784c927
Add content SId check and add log points
bhardwajaditya Aug 4, 2023
4d27e3c
Capitalize template payload variables
bhardwajaditya Aug 4, 2023
93256bd
Update twilio library
bhardwajaditya Aug 4, 2023
9ee6b20
Modify from field for content templates
bhardwajaditya Aug 8, 2023
c6faa4c
Add hardcoded body for empty body cases
bhardwajaditya Aug 8, 2023
f0e4b39
Add log points for message sent to twilio
bhardwajaditya Sep 5, 2023
3ad1c6d
Modify log point
bhardwajaditya Sep 5, 2023
1573ff7
Remove hardcoded body
bhardwajaditya Sep 5, 2023
10b2a91
test camelCase
ericrosenthal Sep 5, 2023
75f691e
use proper from number
ericrosenthal Sep 5, 2023
8680417
Merge pull request #1396 from WideChat/ear_whatsapp_template
bhardwajaditya Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions apps/meteor/app/livechat/server/sendMessageBySMS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,21 @@ callbacks.add(
extraData = Object.assign({}, extraData, { location });
}

if (message.customFields && message.customFields.contentSid) {
const { contentSid } = message.customFields;
extraData = Object.assign({}, extraData, { contentSid });
}

if (message.customFields && message.customFields.contentVariables) {
const { contentVariables } = message.customFields;
extraData = Object.assign({}, extraData, { contentVariables });
}

if (message.customFields && message.customFields.messagingServiceSid) {
const { messagingServiceSid } = message.customFields;
extraData = Object.assign({}, extraData, { messagingServiceSid });
}

const SMSService = SMS.getService(settings.get('SMS_Service'));

if (!SMSService) {
Expand Down
15 changes: 15 additions & 0 deletions apps/meteor/app/sms/server/services/twilio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,18 @@ class Twilio {
body = TAPi18n.__('Location', { lng: defaultLanguage });
}

let contentSid;
let contentVariables;
let messagingServiceSid;
if (extraData && extraData.contentSid) {
contentSid = extraData.contentSid;
messagingServiceSid = extraData.messagingServiceSid;
}

if (extraData && extraData.contentVariables) {
contentVariables = JSON.stringify(extraData.contentVariables);
}

if (!messageQueue[toNumber]) {
messageQueue[toNumber] = [];
}
Expand All @@ -167,6 +179,9 @@ class Twilio {
body,
...(mediaUrl && { mediaUrl }),
...(persistentAction && { persistentAction }),
...(contentSid && { contentSid }),
ear-dev marked this conversation as resolved.
Show resolved Hide resolved
...(messagingServiceSid && { messagingServiceSid }),
...(contentVariables && { contentVariables }),
});

if (!messageQueueProcessor[toNumber]) {
Expand Down