danog/telegram-tt
1
0
Fork 0
mirror of https://github.com/danog/telegram-tt.git synced 2025-01-22 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Message List: Fixes for detecting unread messages

Browse Source
This commit is contained in:
Alexander Zinchuk 2021-05-15 00:53:28 +03:00
parent 84f8b64040
commit 6fd1b9f309
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/gramjs/apiBuilders/chats.ts
View File

@ -126,6 +126,7 @@ function buildApiChatRestrictions(peerEntity: GramJs.TypeUser | GramJs.TypeChat)
&& peerEntity.restrictionReason.some((reason) => reason.platform === 'all');
return {
// `left` is weirdly set to `true` on all channels never joined before
isNotJoined: peerEntity.left,
isRestricted,
restrictionReason: buildApiChatRestrictionReason(peerEntity.restrictionReason),

9
src/modules/selectors/messages.ts
View File

@ -499,8 +499,9 @@ export function selectRealLastReadId(global: GlobalState, chatId: number, thread
}
export function selectFirstUnreadId(global: GlobalState, chatId: number, threadId: number) {
const chat = selectChat(global, chatId);
if (threadId === MAIN_THREAD_ID) {
const chat = selectChat(global, chatId);
if (!chat) {
return undefined;
}
@ -519,12 +520,12 @@ export function selectFirstUnreadId(global: GlobalState, chatId: number, threadI
}
const lastReadId = selectRealLastReadId(global, chatId, threadId);
if (!lastReadId) {
if (!lastReadId && chat && chat.isNotJoined) {
return undefined;
}
if (outlyingIds) {
const found = outlyingIds.find((id) => {
const found = !lastReadId ? outlyingIds[0] : outlyingIds.find((id) => {
return id > lastReadId && byId[id] && (!byId[id].isOutgoing || byId[id].isFromScheduled);
});
if (found) {
@ -533,7 +534,7 @@ export function selectFirstUnreadId(global: GlobalState, chatId: number, threadI
}
if (listedIds) {
const found = listedIds.find((id) => {
const found = !lastReadId ? listedIds[0] : listedIds.find((id) => {
return id > lastReadId && byId[id] && (!byId[id].isOutgoing || byId[id].isFromScheduled);
});
if (found) {