bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle unreadCount when messages are deleted

Browse source
This commit is contained in:
Chewbacca 2022-10-27 13:59:54 -04:00
parent da1d8c7e97
commit 3e2888eb75
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/soapbox/actions/streaming.ts
View file

@ -78,10 +78,10 @@ const updateChat = (payload: ChatPayload) => {
}; };
const removeChatMessage = (payload: string) => { const removeChatMessage = (payload: string) => {
const chat = JSON.parse(payload); const data = JSON.parse(payload);
const chatMessageId = chat.chat_message_id; const chatMessageId = data.deleted_message_id;
removePageItem(ChatKeys.chatMessages(chat.id), chatMessageId, (o: any, n: any) => Number(o.id) === Number(n)); removePageItem(ChatKeys.chatMessages(data.chat_id), chatMessageId, (o: any, n: any) => String(o.id) === String(n));
}; };
const connectTimelineStream = ( const connectTimelineStream = (

21
app/soapbox/queries/chats.ts
View file

@ -1,4 +1,4 @@
import { useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query'; import { InfiniteData, useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query';
import sumBy from 'lodash/sumBy'; import sumBy from 'lodash/sumBy';
import { fetchRelationships } from 'soapbox/actions/accounts'; import { fetchRelationships } from 'soapbox/actions/accounts';
@ -130,8 +130,7 @@ const useChats = (search?: string) => {
const link = getNextLink(response); const link = getNextLink(response);
const hasMore = !!link; const hasMore = !!link;
// TODO: change to response header setUnreadChatsCount(Number(response.headers['x-unread-messages-count']) || sumBy(data, (chat) => chat.unread));
setUnreadChatsCount(sumBy(data, (chat) => chat.unread));
// Set the relationships to these users in the redux store. // Set the relationships to these users in the redux store.
dispatch(fetchRelationships(data.map((item) => item.account.id))); dispatch(fetchRelationships(data.map((item) => item.account.id)));
@ -190,12 +189,26 @@ const useChat = (chatId?: string) => {
const useChatActions = (chatId: string) => { const useChatActions = (chatId: string) => {
const api = useApi(); const api = useApi();
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const { setUnreadChatsCount } = useStatContext();
const { chat, setChat, setEditing } = useChatContext(); const { chat, setChat, setEditing } = useChatContext();
const markChatAsRead = (lastReadId: string) => { const markChatAsRead = (lastReadId: string) => {
api.post<IChat>(`/api/v1/pleroma/chats/${chatId}/read`, { last_read_id: lastReadId }) api.post<IChat>(`/api/v1/pleroma/chats/${chatId}/read`, { last_read_id: lastReadId })
.then(({ data }) => updatePageItem(['chats', 'search'], data, (o, n) => o.id === n.id)) .then(({ data }) => {
updatePageItem(ChatKeys.chatSearch(), data, (o, n) => o.id === n.id);
const queryData = queryClient.getQueryData<InfiniteData<PaginatedResult<unknown>>>(ChatKeys.chatSearch());
if (queryData) {
const flattenedQueryData: any = flattenPages(queryData)?.map((chat: any) => {
if (chat.id === data.id) {
return data;
} else {
return chat;
}
});
setUnreadChatsCount(sumBy(flattenedQueryData, (chat: IChat) => chat.unread));
}
})
.catch(() => null); .catch(() => null);
}; };