mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Don't use MTP* for ChannelData flags.

Browse Source
This commit is contained in:
John Preston
2021-07-08 16:11:09 +03:00
parent 5040c2e766
commit a74228acea
18 changed files with 209 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/info/profile/info_profile_values.cpp
View File

@@ -380,13 +380,13 @@ template <typename Flag, typename Peer>
rpl::producer<Badge> BadgeValueFromFlags(Peer peer) {
return Data::PeerFlagsValue(
peer,
Flag::f_verified | Flag::f_scam | Flag::f_fake
Flag::Verified | Flag::Scam | Flag::Fake
) | rpl::map([=](base::flags<Flag> value) {
return (value & Flag::f_verified)
return (value & Flag::Verified)
? Badge::Verified
: (value & Flag::f_scam)
: (value & Flag::Scam)
? Badge::Scam
: (value & Flag::f_fake)
: (value & Flag::Fake)
? Badge::Fake
: Badge::None;
});
@@ -394,21 +394,9 @@ rpl::producer<Badge> BadgeValueFromFlags(Peer peer) {
rpl::producer<Badge> BadgeValue(not_null<PeerData*> peer) {
if (const auto user = peer->asUser()) {
using Flag = UserDataFlag;
return Data::PeerFlagsValue(
user,
Flag::Verified | Flag::Scam | Flag::Fake
) | rpl::map([=](base::flags<Flag> value) {
return (value & Flag::Verified)
? Badge::Verified
: (value & Flag::Scam)
? Badge::Scam
: (value & Flag::Fake)
? Badge::Fake
: Badge::None;
});
return BadgeValueFromFlags<UserDataFlag>(user);
} else if (const auto channel = peer->asChannel()) {
return BadgeValueFromFlags<MTPDchannel::Flag>(channel);
return BadgeValueFromFlags<ChannelDataFlag>(channel);
}
return rpl::single(Badge::None);
}