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

Refactor outbound delivery state, take 2

Browse source 
This reverts commit ad217c808d.
This commit is contained in:
Evan Hahn 2021-07-19 17:44:49 -05:00 • committed by GitHub
parent aade43bfa3
commit c4a09b7507
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 2303 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

52
ts/models/conversations.ts
View file

@ -54,7 +54,15 @@ import { handleMessageSend } from '../util/handleMessageSend';
import { getConversationMembers } from '../util/getConversationMembers';
import { sendReadReceiptsFor } from '../util/sendReadReceiptsFor';
import { updateConversationsWithUuidLookup } from '../updateConversationsWithUuidLookup';
import { filter, map, take } from '../util/iterables';
import { SendStatus } from '../messages/MessageSendState';
import {
concat,
filter,
map,
take,
repeat,
zipObject,
} from '../util/iterables';
import * as universalExpireTimer from '../util/universalExpireTimer';
import { GroupNameCollisionsWithIdsByTitle } from '../util/groupMemberNameCollisions';
import {
@ -3175,7 +3183,6 @@ export class ConversationModel extends window.Backbone
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const destination = this.getSendTarget()!;
const recipients = this.getRecipients();
return this.queueJob('sendDeleteForEveryone', async () => {
window.log.info(
@ -3194,10 +3201,8 @@ export class ConversationModel extends window.Backbone
sent_at: timestamp,
received_at: window.Signal.Util.incrementMessageCounter(),
received_at_ms: timestamp,
recipients,
deletedForEveryoneTimestamp: targetTimestamp,
timestamp,
...(isDirectConversation(this.attributes) ? { destination } : {}),
});
// We're offline!
@ -3307,7 +3312,6 @@ export class ConversationModel extends window.Backbone
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const destination = this.getSendTarget()!;
const recipients = this.getRecipients();
return this.queueJob('sendReactionMessage', async () => {
window.log.info(
@ -3330,10 +3334,8 @@ export class ConversationModel extends window.Backbone
sent_at: timestamp,
received_at: window.Signal.Util.incrementMessageCounter(),
received_at_ms: timestamp,
recipients,
reaction: outgoingReaction,
timestamp,
...(isDirectConversation(this.attributes) ? { destination } : {}),
});
// This is to ensure that the functions in send() and sendSyncMessage() don't save
@ -3526,6 +3528,18 @@ export class ConversationModel extends window.Backbone
now
);
const recipientMaybeConversations = map(recipients, identifier =>
window.ConversationController.get(identifier)
);
const recipientConversations = filter(
recipientMaybeConversations,
isNotNil
);
const recipientConversationIds = concat(
map(recipientConversations, c => c.id),
[window.ConversationController.getOurConversationIdOrThrow()]
);
// Here we move attachments to disk
const messageWithSchema = await upgradeMessageSchema({
timestamp: now,
@ -3543,6 +3557,13 @@ export class ConversationModel extends window.Backbone
sticker,
bodyRanges: mentions,
sendHQImages,
sendStateByConversationId: zipObject(
recipientConversationIds,
repeat({
status: SendStatus.Pending,
updatedAt: now,
})
),
});
if (isDirectConversation(this.attributes)) {
@ -3586,17 +3607,13 @@ export class ConversationModel extends window.Backbone
// We're offline!
if (!window.textsecure.messaging) {
const errors = [
...(this.contactCollection && this.contactCollection.length
? this.contactCollection
: [this]),
].map(contact => {
const errors = map(recipientConversationIds, conversationId => {
const error = new Error('Network is not available') as CustomError;
error.name = 'SendMessageNetworkError';
error.identifier = contact.get('id');
error.identifier = conversationId;
return error;
});
await message.saveErrors(errors);
await message.saveErrors([...errors]);
return null;
}
@ -3782,6 +3799,7 @@ export class ConversationModel extends window.Backbone
(previewMessage
? getMessagePropStatus(
previewMessage.attributes,
ourConversationId,
window.storage.get('read-receipt-setting', false)
)
: null) || null,
@ -4062,9 +4080,6 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as MessageAttributesType);
if (isDirectConversation(this.attributes)) {
model.set({ destination: this.getSendTarget() });
}
const id = await window.Signal.Data.saveMessage(model.attributes);
model.set({ id });
@ -4160,9 +4175,6 @@ export class ConversationModel extends window.Backbone
// TODO: DESKTOP-722
} as unknown) as MessageAttributesType);
if (isDirectConversation(this.attributes)) {
model.set({ destination: this.id });
}
const id = await window.Signal.Data.saveMessage(model.attributes);
model.set({ id });