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

Chat: Fix unread counter after sleep (#3799)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-09-08 18:39:09 +02:00
parent efe9b27222
commit b421ac25d2
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/api/gramjs/updateManager.ts
View File

@ -49,7 +49,7 @@ export function applyState(state: State) {
localDb.commonBoxState.qts = state.qts; localDb.commonBoxState.qts = state.qts;
} }
export function processUpdate(update: Update, isFromDifference?: boolean) { export function processUpdate(update: Update, isFromDifference?: boolean, shouldOnlySave?: boolean) {
if (update instanceof UpdateConnectionState) { if (update instanceof UpdateConnectionState) {
if (update.state === UpdateConnectionState.connected && isInited) { if (update.state === UpdateConnectionState.connected && isInited) {
scheduleGetDifference(); scheduleGetDifference();
@ -75,7 +75,7 @@ export function processUpdate(update: Update, isFromDifference?: boolean) {
(update as SeqUpdate)._isFromDifference = true; (update as SeqUpdate)._isFromDifference = true;
} }
saveSeqUpdate(update); saveSeqUpdate(update, shouldOnlySave);
return; return;
} }
@ -88,7 +88,7 @@ export function processUpdate(update: Update, isFromDifference?: boolean) {
// eslint-disable-next-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle
(update as PtsUpdate)._isFromDifference = true; (update as PtsUpdate)._isFromDifference = true;
} }
savePtsUpdate(update); savePtsUpdate(update, shouldOnlySave);
return; return;
} }
@ -150,13 +150,13 @@ function applyUpdate(updateObject: SeqUpdate | PtsUpdate) {
} }
} }
function saveSeqUpdate(update: GramJs.Updates | GramJs.UpdatesCombined) { function saveSeqUpdate(update: GramJs.Updates | GramJs.UpdatesCombined, shouldOnlySave?: boolean) {
SEQ_QUEUE.add(update); SEQ_QUEUE.add(update);
popSeqQueue(); if (!shouldOnlySave) popSeqQueue();
} }
function savePtsUpdate(update: PtsUpdate) { function savePtsUpdate(update: PtsUpdate, shouldOnlySave?: boolean) {
const channelId = getUpdateChannelId(update); const channelId = getUpdateChannelId(update);
const ptsQueue = PTS_QUEUE.get(channelId) || new SortedQueue<PtsUpdate>(ptsComparator); const ptsQueue = PTS_QUEUE.get(channelId) || new SortedQueue<PtsUpdate>(ptsComparator);
@ -164,7 +164,7 @@ function savePtsUpdate(update: PtsUpdate) {
PTS_QUEUE.set(channelId, ptsQueue); PTS_QUEUE.set(channelId, ptsQueue);
popPtsQueue(channelId); if (!shouldOnlySave) popPtsQueue(channelId);
} }
function popSeqQueue() { function popSeqQueue() {
@ -282,9 +282,6 @@ export async function getDifference() {
qts: localDb.commonBoxState.qts, qts: localDb.commonBoxState.qts,
})); }));
SEQ_QUEUE.clear();
PTS_QUEUE.get(COMMON_BOX_QUEUE_ID)?.clear();
if (!response || response instanceof GramJs.updates.DifferenceTooLong) { if (!response || response instanceof GramJs.updates.DifferenceTooLong) {
forceSync(); forceSync();
return; return;
@ -333,8 +330,6 @@ async function getChannelDifference(channelId: string) {
limit: CHANNEL_DIFFERENCE_LIMIT, limit: CHANNEL_DIFFERENCE_LIMIT,
})); }));
PTS_QUEUE.delete(channelId);
if (!response) { if (!response) {
if (DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
@ -351,10 +346,11 @@ async function getChannelDifference(channelId: string) {
localDb.channelPtsById[channelId] = response.pts; localDb.channelPtsById[channelId] = response.pts;
if (response instanceof GramJs.updates.ChannelDifferenceEmpty) { if (response instanceof GramJs.updates.ChannelDifferenceEmpty) {
popPtsQueue(channelId); // Continue processing updates in queue
return; return;
} }
processDifference(response); processDifference(response, channelId);
if (!response.final) { if (!response.final) {
getChannelDifference(channelId); getChannelDifference(channelId);
@ -403,6 +399,7 @@ async function loadRemoteState() {
function processDifference( function processDifference(
difference: GramJs.updates.Difference | GramJs.updates.DifferenceSlice | GramJs.updates.ChannelDifference, difference: GramJs.updates.Difference | GramJs.updates.DifferenceSlice | GramJs.updates.ChannelDifference,
channelId?: string,
) { ) {
difference.newMessages.forEach((message) => { difference.newMessages.forEach((message) => {
updater(new GramJs.UpdateNewMessage({ updater(new GramJs.UpdateNewMessage({
@ -418,9 +415,27 @@ function processDifference(
dispatchUserAndChatUpdates(difference.users); dispatchUserAndChatUpdates(difference.users);
dispatchUserAndChatUpdates(difference.chats); dispatchUserAndChatUpdates(difference.chats);
// Ignore `pts`/`seq` holes when applying updates from difference
// BUT, if we got an `UpdateChannelTooLong`, make sure to process other updates after receiving `ChannelDifference`
const channelTooLongIds = new Set<string>();
difference.otherUpdates.forEach((update) => { difference.otherUpdates.forEach((update) => {
processUpdate(update, true); const updateChannelId = getUpdateChannelId(update);
if (update instanceof GramJs.UpdateChannelTooLong) {
channelTooLongIds.add(getUpdateChannelId(update));
}
const shouldApplyImmediately = !channelTooLongIds.has(updateChannelId);
processUpdate(update, shouldApplyImmediately, !shouldApplyImmediately);
}); });
// Continue processing updates in queues
if (channelId) {
popPtsQueue(channelId);
} else {
popSeqQueue();
}
} }
function getPtsCount(update: PtsUpdate) { function getPtsCount(update: PtsUpdate) {

1
src/global/actions/api/sync.ts
View File

@ -74,6 +74,7 @@ addActionHandler('sync', (global, actions): ActionReturnType => {
...global, ...global,
isSyncing: false, isSyncing: false,
isSynced: true, isSynced: true,
isFetchingDifference: false,
}; };
setGlobal(global); setGlobal(global);