mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Retry send: Always remove all errors and recalculate recipients

Browse source
This commit is contained in:
Scott Nonnenberg 2019-03-18 18:25:42 -07:00
parent 377ab6c1cb
commit 4d8fbe95ff
1 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
js/models/messages.js
View file

@ -778,46 +778,26 @@
return null;
}
const [retries, errors] = _.partition(
this.get('errors'),
this.isReplayableError.bind(this)
);
// Put the errors back which aren't replayable
this.set({ errors });
this.set({ errors: null });
const conversation = this.getConversation();
const intendedRecipients = this.get('recipients') || [];
const successfulRecipients = this.get('sent_to') || [];
const currentRecipients = conversation.getRecipients();
const profileKey = conversation.get('profileSharing')
? storage.get('profileKey')
: null;
const errorNumbers = retries
.map(retry => retry.number)
.filter(item => Boolean(item));
let numbers = _.intersection(
errorNumbers,
intendedRecipients,
currentRecipients
);
let recipients = _.intersection(intendedRecipients, currentRecipients);
recipients = _.without(recipients, successfulRecipients);
if (!numbers.length) {
window.log.warn(
'retrySend: No numbers in error set, using all recipients'
);
if (!recipients.length) {
window.log.warn('retrySend: Nobody to send to!');
if (conversation) {
numbers = _.intersection(currentRecipients, intendedRecipients);
// We clear all errors here to start with a fresh slate, since we are starting
// from scratch on this message with a fresh set of recipients
this.set({ errors: null });
} else {
throw new Error(
'No numbers in error set, did not find conversation for message'
);
}
return window.Signal.Data.saveMessage(this.attributes, {
Message: Whisper.Message,
});
}
const attachmentsWithData = await Promise.all(
@ -833,8 +813,8 @@
const previewWithData = await loadPreviewData(this.get('preview'));
// Special-case the self-send case - we send only a sync message
if (numbers.length === 1 && numbers[0] === this.OUR_NUMBER) {
const [number] = numbers;
if (recipients.length === 1 && recipients[0] === this.OUR_NUMBER) {
const [number] = recipients;
const dataMessage = await textsecure.messaging.getMessageProto(
number,
body,
@ -852,7 +832,7 @@
const options = conversation.getSendOptions();
if (conversation.isPrivate()) {
const [number] = numbers;
const [number] = recipients;
promise = textsecure.messaging.sendMessageToNumber(
number,
body,
@ -870,7 +850,7 @@
promise = textsecure.messaging.sendMessage(
{
recipients: numbers,
recipients,
body,
timestamp: this.get('sent_at'),
attachments,