mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Allow removing users invited by me.

Browse Source
This commit is contained in:
John Preston
2020-06-03 12:57:36 +04:00
parent ca97e3c375
commit 63c6a1db82
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
View File

@@ -354,6 +354,16 @@ bool ParticipantsAdditionalData::canRestrictUser(
Unexpected("Peer in ParticipantsAdditionalData::canRestrictUser."); Unexpected("Peer in ParticipantsAdditionalData::canRestrictUser.");
} }
bool ParticipantsAdditionalData::canRemoveUser(
not_null<UserData*> user) const {
if (canRestrictUser(user)) {
return true;
} else if (const auto chat = _peer->asChat()) {
return chat->invitedByMe.contains(user);
}
return false;
}
auto ParticipantsAdditionalData::adminRights( auto ParticipantsAdditionalData::adminRights(
not_null<UserData*> user) const not_null<UserData*> user) const
-> std::optional<MTPChatAdminRights> { -> std::optional<MTPChatAdminRights> {
@@ -1436,6 +1446,8 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
tr::lng_context_restrict_user(tr::now), tr::lng_context_restrict_user(tr::now),
crl::guard(this, [=] { showRestricted(user); })); crl::guard(this, [=] { showRestricted(user); }));
} }
}
if (_additional.canRemoveUser(user)) {
if (!_additional.isKicked(user)) { if (!_additional.isKicked(user)) {
const auto isGroup = _peer->isChat() || _peer->isMegagroup(); const auto isGroup = _peer->isChat() || _peer->isMegagroup();
result->addAction( result->addAction(
@@ -1806,7 +1818,7 @@ auto ParticipantsBoxController::computeType(
: _additional.adminRights(user).has_value() : _additional.adminRights(user).has_value()
? Rights::Admin ? Rights::Admin
: Rights::Normal; : Rights::Normal;
result.canRemove = _additional.canRestrictUser(user); result.canRemove = _additional.canRemoveUser(user);
return result; return result;
} }

1
Telegram/SourceFiles/boxes/peers/edit_participants_box.h
View File

@@ -88,6 +88,7 @@ public:
[[nodiscard]] bool canEditAdmin(not_null<UserData*> user) const; [[nodiscard]] bool canEditAdmin(not_null<UserData*> user) const;
[[nodiscard]] bool canAddOrEditAdmin(not_null<UserData*> user) const; [[nodiscard]] bool canAddOrEditAdmin(not_null<UserData*> user) const;
[[nodiscard]] bool canRestrictUser(not_null<UserData*> user) const; [[nodiscard]] bool canRestrictUser(not_null<UserData*> user) const;
[[nodiscard]] bool canRemoveUser(not_null<UserData*> user) const;
[[nodiscard]] std::optional<MTPChatAdminRights> adminRights( [[nodiscard]] std::optional<MTPChatAdminRights> adminRights(
not_null<UserData*> user) const; not_null<UserData*> user) const;
QString adminRank(not_null<UserData*> user) const; QString adminRank(not_null<UserData*> user) const;