Skip to content

Commit 35f2e0f

Browse files
authored
feat: support to c2sms into multiple recipients (#1088)
1 parent ce7c723 commit 35f2e0f

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/lib/Adapter/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,14 +550,15 @@ class Adapter extends AdapterCore {
550550
});
551551
}
552552

553-
clickToSMS(phoneNumber, text, conversation, attachments = undefined) {
553+
clickToSMS(phoneNumber, text, conversation, attachments = undefined, recipient = undefined) {
554554
this.setMinimized(false);
555555
this._postMessage({
556556
type: 'rc-adapter-new-sms',
557557
phoneNumber,
558558
text,
559559
conversation,
560560
attachments,
561+
recipient,
561562
});
562563
}
563564

src/modules/Adapter/index.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ export default class Adapter extends AdapterModuleCore {
316316
}
317317
break;
318318
case 'rc-adapter-new-sms':
319-
this._newSMS(data.phoneNumber, data.text, data.conversation, data.attachments);
319+
this._newSMS(data.phoneNumber, data.text, data.conversation, data.attachments, data.recipient);
320320
break;
321321
case 'rc-adapter-new-call':
322322
this._newCall(data.phoneNumber, data.toCall);
@@ -1172,12 +1172,13 @@ export default class Adapter extends AdapterModuleCore {
11721172
}
11731173
}
11741174

1175-
_newSMS(phoneNumber, text, conversation, attachments = null) {
1175+
_newSMS(phoneNumber, text, conversation, attachments = null, recipient = false) {
11761176
if (!this._auth.loggedIn) {
11771177
return;
11781178
}
11791179
const validAttachments = getValidAttachments(attachments);
1180-
if (conversation) {
1180+
const currentToNumbers = this._composeText.toNumbers;
1181+
if (conversation && currentToNumbers.length === 0) {
11811182
const normalizedNumber = normalizeNumber({
11821183
phoneNumber,
11831184
countryCode: this._regionSettings.countryCode,
@@ -1205,9 +1206,12 @@ export default class Adapter extends AdapterModuleCore {
12051206
}
12061207
}
12071208
this._composeTextUI.gotoComposeText();
1208-
if (phoneNumber) {
1209+
if (phoneNumber && !recipient) {
12091210
this._composeText.updateTypingToNumber(phoneNumber);
12101211
}
1212+
if (phoneNumber && recipient) {
1213+
this._composeText.addToNumber({ phoneNumber, name: recipient.name || phoneNumber });
1214+
}
12111215
if (text && text.length > 0) {
12121216
this._composeText.updateMessageText(String(text));
12131217
}

0 commit comments

Comments
 (0)