RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix incorrect admin log 

Type: Restricted to Member
This commit is contained in:
c0re100 2022-01-21 05:48:23 +08:00 committed by John Preston
parent c0a81f2428
commit 4bb3aec168
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
View File

@ -219,7 +219,7 @@ TextWithEntities GenerateAdminChangeText(
return result;
};
QString GenerateBannedChangeText(
QString GeneratePermissionsChangeText(
ChatRestrictionsInfo newRights,
ChatRestrictionsInfo prevRights) {
using Flag = ChatRestriction;
@ -242,7 +242,7 @@ QString GenerateBannedChangeText(
return CollectChanges(phraseMap, prevRights.flags, newRights.flags);
}
TextWithEntities GenerateBannedChangeText(
TextWithEntities GeneratePermissionsChangeText(
PeerId participantId,
const TextWithEntities &user,
ChatRestrictionsInfo newRights,
@ -281,7 +281,7 @@ TextWithEntities GenerateBannedChangeText(
lt_until,
TextWithEntities { untilText },
Ui::Text::WithEntities);
const auto changes = GenerateBannedChangeText(newRights, prevRights);
const auto changes = GeneratePermissionsChangeText(newRights, prevRights);
if (!changes.isEmpty()) {
result.text.append('\n' + changes);
}
@ -478,7 +478,13 @@ auto GenerateParticipantChangeText(
ChatAdminRightsInfo(),
oldRights);
} else if (oldParticipant && oldParticipant->type() == Type::Banned) {
return GenerateBannedChangeText(
return GeneratePermissionsChangeText(
participantId,
user,
ChatRestrictionsInfo(),
oldRestrictions);
} else if (oldParticipant && oldParticipant->type() == Type::Restricted && participant.type() == Type::Member) {
return GeneratePermissionsChangeText(
participantId,
user,
ChatRestrictionsInfo(),
@ -517,7 +523,7 @@ auto GenerateParticipantChangeText(
const auto user = GenerateParticipantString(
&channel->session(),
peerId);
return GenerateBannedChangeText(
return GeneratePermissionsChangeText(
peerId,
user,
participant.restrictions(),
@ -556,7 +562,7 @@ TextWithEntities GenerateDefaultBannedRightsChangeText(
auto result = TextWithEntities{
tr::lng_admin_log_changed_default_permissions(tr::now)
};
const auto changes = GenerateBannedChangeText(rights, oldRights);
const auto changes = GeneratePermissionsChangeText(rights, oldRights);
if (!changes.isEmpty()) {
result.text.append('\n' + changes);
}