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

Use correct timestamp for receipts of edited messages

Browse source
This commit is contained in:
Fedor Indutny 2023-05-16 10:37:12 -07:00 • committed by GitHub
parent 8fe0047822
commit 5869717cd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 156 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ts/models/conversations.ts
View file

@ -29,6 +29,7 @@ import { memoizeByThis } from '../util/memoizeByThis';
import { getInitials } from '../util/getInitials';
import { normalizeUuid } from '../util/normalizeUuid';
import { clearTimeoutIfNecessary } from '../util/clearTimeoutIfNecessary';
import { getMessageSentTimestamp } from '../util/getMessageSentTimestamp';
import type { AttachmentType, ThumbnailType } from '../types/Attachment';
import { toDayMillis } from '../util/timestamp';
import { isVoiceMessage } from '../types/Attachment';
@ -2321,7 +2322,7 @@ export class ConversationModel extends window.Backbone
conversationId,
senderE164: m.source,
senderUuid: m.sourceUuid,
timestamp: m.sent_at,
timestamp: getMessageSentTimestamp(m, { log }),
isDirectConversation: isDirectConversation(this.attributes),
})),
});

5
ts/models/messages.ts
View file

@ -48,6 +48,7 @@ import type {
import { SendMessageProtoError } from '../textsecure/Errors';
import * as expirationTimer from '../util/expirationTimer';
import { getUserLanguages } from '../util/userLanguages';
import { getMessageSentTimestamp } from '../util/getMessageSentTimestamp';
import type { ReactionType } from '../types/Reactions';
import { UUID, UUIDKind } from '../types/UUID';
@ -1802,9 +1803,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
);
const isEditedMessage = Boolean(this.get('editHistory'));
const mainMessageTimestamp = this.get('sent_at') || this.get('timestamp');
const timestamp =
this.get('editMessageTimestamp') || mainMessageTimestamp;
const timestamp = getMessageSentTimestamp(this.attributes, { log });
const encodedContent = isEditedMessage
? {