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

Fix sync message for editMessage

Browse source
This commit is contained in:
Fedor Indutny 2023-05-11 08:47:41 -07:00 • committed by GitHub
parent 22a540f066
commit 9a7f1e86e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ts/models/messages.ts
View file

@ -1806,12 +1806,17 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
const timestamp = const timestamp =
this.get('editMessageTimestamp') || mainMessageTimestamp; this.get('editMessageTimestamp') || mainMessageTimestamp;
const encodedContent = isEditedMessage
? {
encodedEditMessage: dataMessage,
}
: {
encodedDataMessage: dataMessage,
};
return handleMessageSend( return handleMessageSend(
messaging.sendSyncMessage({ messaging.sendSyncMessage({
encodedDataMessage: dataMessage, ...encodedContent,
editedMessageTimestamp: isEditedMessage
? mainMessageTimestamp
: undefined,
timestamp, timestamp,
destination: conv.get('e164'), destination: conv.get('e164'),
destinationUuid: conv.get('uuid'), destinationUuid: conv.get('uuid'),

11
ts/textsecure/SendMessage.ts
View file

@ -1181,8 +1181,8 @@ export default class MessageSender {
// Note: this is used for sending real messages to your other devices after sending a // Note: this is used for sending real messages to your other devices after sending a
// message to others. // message to others.
async sendSyncMessage({ async sendSyncMessage({
editedMessageTimestamp,
encodedDataMessage, encodedDataMessage,
encodedEditMessage,
timestamp, timestamp,
destination, destination,
destinationUuid, destinationUuid,
@ -1195,8 +1195,8 @@ export default class MessageSender {
storyMessage, storyMessage,
storyMessageRecipients, storyMessageRecipients,
}: Readonly<{ }: Readonly<{
editedMessageTimestamp?: number;
encodedDataMessage?: Uint8Array; encodedDataMessage?: Uint8Array;
encodedEditMessage?: Uint8Array;
timestamp: number; timestamp: number;
destination: string | undefined; destination: string | undefined;
destinationUuid: string | null | undefined; destinationUuid: string | null | undefined;
@ -1214,11 +1214,8 @@ export default class MessageSender {
const sentMessage = new Proto.SyncMessage.Sent(); const sentMessage = new Proto.SyncMessage.Sent();
sentMessage.timestamp = Long.fromNumber(timestamp); sentMessage.timestamp = Long.fromNumber(timestamp);
if (editedMessageTimestamp && encodedDataMessage) { if (encodedEditMessage) {
const dataMessage = Proto.DataMessage.decode(encodedDataMessage); const editMessage = Proto.EditMessage.decode(encodedEditMessage);
const editMessage = new Proto.EditMessage();
editMessage.dataMessage = dataMessage;
editMessage.targetSentTimestamp = Long.fromNumber(editedMessageTimestamp);
sentMessage.editMessage = editMessage; sentMessage.editMessage = editMessage;
} else if (encodedDataMessage) { } else if (encodedDataMessage) {
const dataMessage = Proto.DataMessage.decode(encodedDataMessage); const dataMessage = Proto.DataMessage.decode(encodedDataMessage);