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

Channels: Fix "No Forwards" toggle (#2720)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-03-04 03:16:24 +01:00
parent 673ad88e4e
commit 8696eb41ce
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/gramjs/updater.ts
View File

@ -80,9 +80,6 @@ export function init(_onUpdate: OnApiUpdate) {
} }
const sentMessageIds = new Set(); const sentMessageIds = new Set();
// Workaround for a situation when an incorrect update comes with an undefined property `adminRights`
let shouldIgnoreNextChannelUpdate = false;
const IGNORE_NEXT_CHANNEL_UPDATE_TIMEOUT = 2000;
function dispatchUserAndChatUpdates(entities: (GramJs.TypeUser | GramJs.TypeChat)[]) { function dispatchUserAndChatUpdates(entities: (GramJs.TypeUser | GramJs.TypeChat)[]) {
entities entities
@ -756,18 +753,6 @@ export function updater(update: Update, originRequest?: GramJs.AnyRequest) {
)); ));
if (channel instanceof GramJs.Channel) { if (channel instanceof GramJs.Channel) {
if (shouldIgnoreNextChannelUpdate) {
shouldIgnoreNextChannelUpdate = false;
return;
}
if (originRequest instanceof GramJs.messages.ToggleNoForwards) {
shouldIgnoreNextChannelUpdate = true;
setTimeout(() => {
shouldIgnoreNextChannelUpdate = false;
}, IGNORE_NEXT_CHANNEL_UPDATE_TIMEOUT);
}
const chat = buildApiChatFromPreview(channel); const chat = buildApiChatFromPreview(channel);
if (chat) { if (chat) {
onUpdate({ onUpdate({

10
src/global/reducers/chats.ts
View File

@ -130,9 +130,15 @@ function getUpdatedChat<T extends GlobalState>(
const chat = byId[chatId]; const chat = byId[chatId];
const omitProps: (keyof ApiChat)[] = []; const omitProps: (keyof ApiChat)[] = [];
const shouldOmitMinInfo = chatUpdate.isMin && chat && !chat.isMin; const shouldIgnoreUndefinedFields = chatUpdate.isMin && chat && !chat.isMin;
if (shouldOmitMinInfo) { if (shouldIgnoreUndefinedFields) {
omitProps.push('isMin', 'accessHash'); omitProps.push('isMin', 'accessHash');
Object.keys(chatUpdate).forEach((key) => {
const prop = key as keyof ApiChat;
if (chatUpdate[prop] === undefined) {
omitProps.push(prop);
}
});
} }
if (!noOmitUnreadReactionCount) { if (!noOmitUnreadReactionCount) {

10
src/global/reducers/users.ts
View File

@ -115,9 +115,15 @@ function getUpdatedUser(global: GlobalState, userId: string, userUpdate: Partial
const user = byId[userId]; const user = byId[userId];
const omitProps: (keyof ApiUser)[] = []; const omitProps: (keyof ApiUser)[] = [];
const shouldOmitMinInfo = userUpdate.isMin && user && !user.isMin; const shouldIgnoreUndefinedFields = userUpdate.isMin && user && !user.isMin;
if (shouldOmitMinInfo) { if (shouldIgnoreUndefinedFields) {
omitProps.push('isMin', 'accessHash'); omitProps.push('isMin', 'accessHash');
Object.keys(userUpdate).forEach((key) => {
const prop = key as keyof ApiUser;
if (userUpdate[prop] === undefined) {
omitProps.push(prop);
}
});
} }
if (areDeepEqual(user?.usernames, userUpdate.usernames)) { if (areDeepEqual(user?.usernames, userUpdate.usernames)) {