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

Chat: Fix applying unban (#6075)

Browse Source
This commit is contained in:
zubiden 2025-07-25 19:34:51 +02:00 committed by Alexander Zinchuk
parent 5c15869a40
commit 155c62e1b8
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ function buildApiChatPermissions(peerEntity: GramJs.TypeUser | GramJs.TypeChat):
}; };
} }
function buildApiChatRestrictions(peerEntity: GramJs.TypeUser | GramJs.TypeChat): { function buildApiChatRestrictions(peerEntity: Entity): {
isNotJoined?: boolean; isNotJoined?: boolean;
isForbidden?: boolean; isForbidden?: boolean;
isRestricted?: boolean; isRestricted?: boolean;
@ -212,17 +212,13 @@ function buildApiChatRestrictions(peerEntity: GramJs.TypeUser | GramJs.TypeChat)
const restrictions = {}; const restrictions = {};
if ('restricted' in peerEntity) { if ('restricted' in peerEntity && !peerEntity.min) {
const restrictionReason = peerEntity.restricted const restrictionReason = buildApiChatRestrictionReason(peerEntity.restrictionReason);
? buildApiChatRestrictionReason(peerEntity.restrictionReason)
: undefined;
if (restrictionReason) { Object.assign(restrictions, {
Object.assign(restrictions, { isRestricted: peerEntity.restricted,
isRestricted: true, restrictionReason,
restrictionReason, });
});
}
} }
if (peerEntity instanceof GramJs.Chat) { if (peerEntity instanceof GramJs.Chat) {

8
src/components/modals/chatInvite/ChatInviteModal.tsx
View File

@ -43,9 +43,11 @@ const ChatInviteModal = ({ modal }: OwnProps) => {
const handleAccept = useLastCallback(() => { const handleAccept = useLastCallback(() => {
acceptChatInvite({ hash: hash! }); acceptChatInvite({ hash: hash! });
showNotification({ if (isRequestNeeded) {
message: isBroadcast ? lang('RequestToJoinChannelSentDescription') : lang('RequestToJoinGroupSentDescription'), showNotification({
}); message: isBroadcast ? lang('RequestToJoinChannelSentDescription') : lang('RequestToJoinGroupSentDescription'),
});
}
handleClose(); handleClose();
}); });