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

Show original sent timestamp for edited messages

Browse source
This commit is contained in:
Scott Nonnenberg 2024-07-15 15:26:50 -07:00 • committed by GitHub
parent 3f9032035f
commit 6503a0aad6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ts/models/conversations.ts
View file

@ -4213,10 +4213,7 @@ export class ConversationModel extends window.Backbone
: undefined; : undefined;
timestamp = timestamp =
callHistory?.timestamp || callHistory?.timestamp || activityMessage.get('sent_at') || timestamp;
activityMessage.get('editMessageTimestamp') ||
activityMessage.get('sent_at') ||
timestamp;
lastMessageReceivedAt = lastMessageReceivedAt =
activityMessage.get('received_at') || lastMessageReceivedAt; activityMessage.get('received_at') || lastMessageReceivedAt;
lastMessageReceivedAtMs = lastMessageReceivedAtMs =

2
ts/state/selectors/message.ts
View file

@ -774,7 +774,7 @@ export const getPropsForMessage = (
status: getMessagePropStatus(message, ourConversationId), status: getMessagePropStatus(message, ourConversationId),
text: message.body, text: message.body,
textDirection: getTextDirection(message.body), textDirection: getTextDirection(message.body),
timestamp: getMessageSentTimestamp(message, { includeEdits: true, log }), timestamp: getMessageSentTimestamp(message, { includeEdits: false, log }),
receivedAtMS: message.received_at_ms, receivedAtMS: message.received_at_ms,
}; };
}; };

8
ts/test-mock/messaging/edit_test.ts
View file

@ -348,7 +348,7 @@ describe('editing', function (this: Mocha.Suite) {
await sendEditedMessage( await sendEditedMessage(
window, window,
firstEdit.dataMessage?.timestamp?.toNumber() ?? 0, originalMessage.timestamp?.toNumber() ?? 0,
'.3' '.3'
); );
@ -361,7 +361,7 @@ describe('editing', function (this: Mocha.Suite) {
debug('opening edit history'); debug('opening edit history');
const secondEditMessage = window.locator( const secondEditMessage = window.locator(
`.module-message[data-testid="${secondEdit.dataMessage?.timestamp?.toNumber()}"]` `.module-message[data-testid="${originalMessage?.timestamp?.toNumber()}"]`
); );
await secondEditMessage await secondEditMessage
.locator('.module-message__metadata__edited') .locator('.module-message__metadata__edited')
@ -669,7 +669,7 @@ describe('editing', function (this: Mocha.Suite) {
debug('sending edit message v3 desktop -> friend'); debug('sending edit message v3 desktop -> friend');
await sendEditedMessage( await sendEditedMessage(
page, page,
editMessageV2.dataMessage?.timestamp?.toNumber() ?? 0, originalMessage?.timestamp?.toNumber() ?? 0,
'3' '3'
); );
@ -690,7 +690,7 @@ describe('editing', function (this: Mocha.Suite) {
debug('sending edit message v4 desktop -> friend'); debug('sending edit message v4 desktop -> friend');
await sendEditedMessage( await sendEditedMessage(
page, page,
editMessageV3.dataMessage?.timestamp?.toNumber() ?? 0, originalMessage?.timestamp?.toNumber() ?? 0,
'4' '4'
); );