ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chat List: Fix update notification disappearing after sync (#2742)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-03-03 16:35:19 +01:00
parent e952dc40d7
commit 17ff3b47a7
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/global/actions/api/chats.ts
View File

@ -1817,7 +1817,7 @@ async function loadChats<T extends GlobalState>(
isFullDraftSync?: boolean,
) {
global = getGlobal();
const lastLocalServiceMessage = selectLastServiceNotification(global)?.message;
let lastLocalServiceMessage = selectLastServiceNotification(global)?.message;
const result = await callApi('fetchChats', {
limit: CHAT_LIST_LOAD_SLICE,
offsetDate,
@ -1838,6 +1838,8 @@ async function loadChats<T extends GlobalState>(
global = getGlobal();
lastLocalServiceMessage = selectLastServiceNotification(global)?.message;
if (shouldReplace && listType === 'active') {
// Always include service notifications chat
if (!chatIds.includes(SERVICE_NOTIFICATIONS_USER_ID)) {
@ -1882,9 +1884,20 @@ async function loadChats<T extends GlobalState>(
global = updateChats(global, buildCollectionByKey(result.chats, 'id'));
global = replaceChatListIds(global, listType, chatIds);
} else {
const newChats = buildCollectionByKey(result.chats, 'id');
if (chatIds.includes(SERVICE_NOTIFICATIONS_USER_ID)) {
const notificationsChat = newChats[SERVICE_NOTIFICATIONS_USER_ID];
if (notificationsChat && lastLocalServiceMessage) {
newChats[SERVICE_NOTIFICATIONS_USER_ID] = {
...notificationsChat,
lastMessage: lastLocalServiceMessage,
};
}
}
global = addUsers(global, buildCollectionByKey(result.users, 'id'));
global = addUserStatuses(global, result.userStatusesById);
global = updateChats(global, buildCollectionByKey(result.chats, 'id'));
global = updateChats(global, newChats);
global = updateChatListIds(global, listType, chatIds);
}