From 6697e0191b8b99c79475e922dd1dfb2ac4e2ff6d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 27 Nov 2022 15:34:43 -0600 Subject: [PATCH] Fix crash against Pleroma (make `latest_read_message_by_account` an optional param) --- app/soapbox/features/chats/components/chat-message-list.tsx | 4 ++-- app/soapbox/queries/chats.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx index f281a5e131..164a4240e9 100644 --- a/app/soapbox/features/chats/components/chat-message-list.tsx +++ b/app/soapbox/features/chats/components/chat-message-list.tsx @@ -78,8 +78,8 @@ const ChatMessageList: React.FC = ({ chat }) => { const account = useOwnAccount(); const features = useFeatures(); - const lastReadMessageDateString = chat.latest_read_message_by_account.find((latest) => latest.id === chat.account.id)?.date; - const myLastReadMessageDateString = chat.latest_read_message_by_account.find((latest) => latest.id === account?.id)?.date; + const lastReadMessageDateString = chat.latest_read_message_by_account?.find((latest) => latest.id === chat.account.id)?.date; + const myLastReadMessageDateString = chat.latest_read_message_by_account?.find((latest) => latest.id === account?.id)?.date; const lastReadMessageTimestamp = lastReadMessageDateString ? new Date(lastReadMessageDateString) : null; const myLastReadMessageTimestamp = myLastReadMessageDateString ? new Date(myLastReadMessageDateString) : null; diff --git a/app/soapbox/queries/chats.ts b/app/soapbox/queries/chats.ts index a57b32591e..3cfeeeda2d 100644 --- a/app/soapbox/queries/chats.ts +++ b/app/soapbox/queries/chats.ts @@ -42,7 +42,7 @@ export interface IChat { id: string unread: boolean } - latest_read_message_by_account: { + latest_read_message_by_account?: { id: string, date: string }[]