Skip to content

Commit 0fda67f

Browse files
authored
fix: formatMessage - reference the correct msg in toLocalMessageBase (#1605)
1 parent 0f0bdbb commit 0fda67f

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

src/utils.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -310,16 +310,16 @@ export function formatMessage(
310310
if (!msg) return null;
311311
return {
312312
...msg,
313-
created_at: message.created_at ? new Date(message.created_at) : new Date(),
314-
deleted_at: message.deleted_at ? new Date(message.deleted_at) : null,
315-
pinned_at: message.pinned_at ? new Date(message.pinned_at) : null,
313+
created_at: msg.created_at ? new Date(msg.created_at) : new Date(),
314+
deleted_at: msg.deleted_at ? new Date(msg.deleted_at) : null,
315+
pinned_at: msg.pinned_at ? new Date(msg.pinned_at) : null,
316316
reaction_groups: maybeGetReactionGroupsFallback(
317-
message.reaction_groups,
318-
message.reaction_counts,
319-
message.reaction_scores,
317+
msg.reaction_groups,
318+
msg.reaction_counts,
319+
msg.reaction_scores,
320320
),
321-
status: message.status || 'received',
322-
updated_at: message.updated_at ? new Date(message.updated_at) : new Date(),
321+
status: msg.status || 'received',
322+
updated_at: msg.updated_at ? new Date(msg.updated_at) : new Date(),
323323
};
324324
};
325325

test/unit/channel.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ describe('Channel _handleChannelEvent', function () {
458458
expect(
459459
channel.state.messages.find((msg) => msg.id === quotingMessage.id).quoted_message
460460
.deleted_at,
461-
).to.be.null;
461+
).to.be.ok;
462462
});
463463

464464
describe('user.messages.deleted', () => {
@@ -577,6 +577,8 @@ describe('Channel _handleChannelEvent', function () {
577577
...deletedMessage,
578578
id: message.quoted_message.id,
579579
user: message.quoted_message.user,
580+
created_at: message.quoted_message.created_at,
581+
updated_at: message.quoted_message.updated_at,
580582
},
581583
});
582584
} else {

test/unit/client.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,6 +1172,8 @@ describe('user.messages.deleted', () => {
11721172
...deletedMessage,
11731173
id: message.quoted_message.id,
11741174
user: message.quoted_message.user,
1175+
created_at: message.quoted_message.created_at,
1176+
updated_at: message.quoted_message.updated_at,
11751177
},
11761178
});
11771179
} else {

0 commit comments

Comments
 (0)