void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ability to see invite links of other admins.

Browse source
This commit is contained in:
John Preston 2021-02-05 17:22:02 +04:00
parent 9d3edb785c
commit 4153603d09
11 changed files with 385 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Telegram/Resources/langs/lang.strings
View file

@ -1216,6 +1216,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_group_invite_custom_limit" = "Enter custom limit"; "lng_group_invite_custom_limit" = "Enter custom limit";
"lng_group_invite_usage_any" = "No limit"; "lng_group_invite_usage_any" = "No limit";
"lng_group_invite_usage_custom" = "Custom"; "lng_group_invite_usage_custom" = "Custom";
"lng_group_invite_other_title" = "Invite links created by other admins";
"lng_group_invite_other_count#one" = "{count} invite link";
"lng_group_invite_other_count#other" = "{count} invite links";
"lng_group_invite_permanent_other" = "Permanent link of this admin";
"lng_group_invite_other_list" = "Invite links created by this admin";
"lng_channel_public_link_copied" = "Link copied to clipboard."; "lng_channel_public_link_copied" = "Link copied to clipboard.";
"lng_context_about_private_link" = "This link will only work for members of this chat."; "lng_context_about_private_link" = "This link will only work for members of this chat.";

86
Telegram/SourceFiles/api/api_invite_links.cpp
View file

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "api/api_invite_links.h" #include "api/api_invite_links.h"
#include "data/data_peer.h" #include "data/data_peer.h"
#include "data/data_user.h"
#include "data/data_chat.h" #include "data/data_chat.h"
#include "data/data_channel.h" #include "data/data_channel.h"
#include "data/data_session.h" #include "data/data_session.h"
@ -103,7 +104,7 @@ void InviteLinks::performCreate(
MTP_int(usageLimit) MTP_int(usageLimit)
)).done([=](const MTPExportedChatInvite &result) { )).done([=](const MTPExportedChatInvite &result) {
const auto callbacks = _createCallbacks.take(peer); const auto callbacks = _createCallbacks.take(peer);
const auto link = prepend(peer, result); const auto link = prepend(peer, peer->session().user(), result);
if (callbacks) { if (callbacks) {
for (const auto &callback : *callbacks) { for (const auto &callback : *callbacks) {
callback(link); callback(link);
@ -135,6 +136,7 @@ auto InviteLinks::lookupPermanent(const Links &links) const -> const Link* {
auto InviteLinks::prepend( auto InviteLinks::prepend(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const MTPExportedChatInvite &invite) -> Link { const MTPExportedChatInvite &invite) -> Link {
const auto link = parse(peer, invite); const auto link = parse(peer, invite);
auto i = _firstSlices.find(peer); auto i = _firstSlices.find(peer);
@ -144,7 +146,10 @@ auto InviteLinks::prepend(
auto &links = i->second; auto &links = i->second;
const auto permanent = lookupPermanent(links); const auto permanent = lookupPermanent(links);
const auto hadPermanent = (permanent != nullptr); const auto hadPermanent = (permanent != nullptr);
auto updateOldPermanent = Update{ .peer = peer }; auto updateOldPermanent = Update{
.peer = peer,
.admin = admin,
};
if (link.permanent && hadPermanent) { if (link.permanent && hadPermanent) {
updateOldPermanent.was = permanent->link; updateOldPermanent.was = permanent->link;
updateOldPermanent.now = *permanent; updateOldPermanent.now = *permanent;
@ -171,21 +176,34 @@ auto InviteLinks::prepend(
if (updateOldPermanent.now) { if (updateOldPermanent.now) {
_updates.fire(std::move(updateOldPermanent)); _updates.fire(std::move(updateOldPermanent));
} }
_updates.fire(Update{ .peer = peer, .now = link }); _updates.fire(Update{
.peer = peer,
.admin = admin,
.now = link
});
return link; return link;
} }
void InviteLinks::edit( void InviteLinks::edit(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
TimeId expireDate, TimeId expireDate,
int usageLimit, int usageLimit,
Fn<void(Link)> done) { Fn<void(Link)> done) {
performEdit(peer, link, std::move(done), false, expireDate, usageLimit); performEdit(
peer,
admin,
link,
std::move(done),
false,
expireDate,
usageLimit);
} }
void InviteLinks::performEdit( void InviteLinks::performEdit(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
Fn<void(Link)> done, Fn<void(Link)> done,
bool revoke, bool revoke,
@ -202,15 +220,6 @@ void InviteLinks::performEdit(
return; return;
} }
if (const auto permanent = revoke ? lookupPermanent(peer) : nullptr) {
if (permanent->link == link) {
// In case of revoking a permanent link
// we should just create a new one instead.
performCreate(peer, std::move(done), true);
return;
}
}
auto &callbacks = _editCallbacks[key]; auto &callbacks = _editCallbacks[key];
if (done) { if (done) {
callbacks.push_back(std::move(done)); callbacks.push_back(std::move(done));
@ -252,13 +261,14 @@ void InviteLinks::performEdit(
} }
_updates.fire(Update{ _updates.fire(Update{
.peer = peer, .peer = peer,
.admin = admin,
.was = key.link, .was = key.link,
.now = link, .now = link,
}); });
using Replaced = MTPDmessages_exportedChatInviteReplaced; using Replaced = MTPDmessages_exportedChatInviteReplaced;
if constexpr (Replaced::Is<decltype(data)>()) { if constexpr (Replaced::Is<decltype(data)>()) {
prepend(peer, data.vnew_invite()); prepend(peer, admin, data.vnew_invite());
} }
}); });
}).fail([=](const RPCError &error) { }).fail([=](const RPCError &error) {
@ -268,17 +278,22 @@ void InviteLinks::performEdit(
void InviteLinks::revoke( void InviteLinks::revoke(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
Fn<void(Link)> done) { Fn<void(Link)> done) {
performEdit(peer, link, std::move(done), true); performEdit(peer, admin, link, std::move(done), true);
} }
void InviteLinks::revokePermanent( void InviteLinks::revokePermanent(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link,
Fn<void()> done) { Fn<void()> done) {
const auto callback = [=](auto&&) { done(); }; const auto callback = [=](auto&&) { done(); };
if (const auto permanent = lookupPermanent(peer)) { if (!link.isEmpty()) {
performEdit(peer, permanent->link, callback, true); performEdit(peer, admin, link, callback, true);
} else if (!admin->isSelf()) {
crl::on_main(&peer->session(), done);
} else { } else {
performCreate(peer, callback, true); performCreate(peer, callback, true);
} }
@ -286,6 +301,7 @@ void InviteLinks::revokePermanent(
void InviteLinks::destroy( void InviteLinks::destroy(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
Fn<void()> done) { Fn<void()> done) {
const auto key = LinkKey{ peer, link }; const auto key = LinkKey{ peer, link };
@ -314,6 +330,7 @@ void InviteLinks::destroy(
} }
_updates.fire(Update{ _updates.fire(Update{
.peer = peer, .peer = peer,
.admin = admin,
.was = key.link, .was = key.link,
}); });
}).fail([=](const RPCError &error) { }).fail([=](const RPCError &error) {
@ -323,6 +340,7 @@ void InviteLinks::destroy(
void InviteLinks::destroyAllRevoked( void InviteLinks::destroyAllRevoked(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
Fn<void()> done) { Fn<void()> done) {
if (const auto i = _deleteRevokedCallbacks.find(peer) if (const auto i = _deleteRevokedCallbacks.find(peer)
; i != end(_deleteRevokedCallbacks)) { ; i != end(_deleteRevokedCallbacks)) {
@ -337,7 +355,7 @@ void InviteLinks::destroyAllRevoked(
} }
_api->request(MTPmessages_DeleteRevokedExportedChatInvites( _api->request(MTPmessages_DeleteRevokedExportedChatInvites(
peer->input, peer->input,
MTP_inputUserSelf() admin->inputUser
)).done([=](const MTPBool &result) { )).done([=](const MTPBool &result) {
if (const auto callbacks = _deleteRevokedCallbacks.take(peer)) { if (const auto callbacks = _deleteRevokedCallbacks.take(peer)) {
for (const auto &callback : *callbacks) { for (const auto &callback : *callbacks) {
@ -349,7 +367,7 @@ void InviteLinks::destroyAllRevoked(
}).send(); }).send();
} }
void InviteLinks::requestLinks(not_null<PeerData*> peer) { void InviteLinks::requestMyLinks(not_null<PeerData*> peer) {
if (_firstSliceRequests.contains(peer)) { if (_firstSliceRequests.contains(peer)) {
return; return;
} }
@ -469,7 +487,7 @@ void InviteLinks::requestJoinedFirstSlice(LinkKey key) {
_firstJoinedRequests.emplace(key, requestId); _firstJoinedRequests.emplace(key, requestId);
} }
void InviteLinks::setPermanent( void InviteLinks::setMyPermanent(
not_null<PeerData*> peer, not_null<PeerData*> peer,
const MTPExportedChatInvite &invite) { const MTPExportedChatInvite &invite) {
auto link = parse(peer, invite); auto link = parse(peer, invite);
@ -483,13 +501,17 @@ void InviteLinks::setPermanent(
i = _firstSlices.emplace(peer).first; i = _firstSlices.emplace(peer).first;
} }
auto &links = i->second; auto &links = i->second;
auto updateOldPermanent = Update{ .peer = peer }; auto updateOldPermanent = Update{
.peer = peer,
.admin = peer->session().user(),
};
if (const auto permanent = lookupPermanent(links)) { if (const auto permanent = lookupPermanent(links)) {
if (permanent->link == link.link) { if (permanent->link == link.link) {
if (permanent->usage != link.usage) { if (permanent->usage != link.usage) {
permanent->usage = link.usage; permanent->usage = link.usage;
_updates.fire(Update{ _updates.fire(Update{
.peer = peer, .peer = peer,
.admin = peer->session().user(),
.was = link.link, .was = link.link,
.now = *permanent .now = *permanent
}); });
@ -512,10 +534,14 @@ void InviteLinks::setPermanent(
if (updateOldPermanent.now) { if (updateOldPermanent.now) {
_updates.fire(std::move(updateOldPermanent)); _updates.fire(std::move(updateOldPermanent));
} }
_updates.fire(Update{ .peer = peer, .now = link }); _updates.fire(Update{
.peer = peer,
.admin = peer->session().user(),
.now = link
});
} }
void InviteLinks::clearPermanent(not_null<PeerData*> peer) { void InviteLinks::clearMyPermanent(not_null<PeerData*> peer) {
auto i = _firstSlices.find(peer); auto i = _firstSlices.find(peer);
if (i == end(_firstSlices)) { if (i == end(_firstSlices)) {
return; return;
@ -526,7 +552,10 @@ void InviteLinks::clearPermanent(not_null<PeerData*> peer) {
return; return;
} }
auto updateOldPermanent = Update{ .peer = peer }; auto updateOldPermanent = Update{
.peer = peer,
.admin = peer->session().user()
};
updateOldPermanent.was = permanent->link; updateOldPermanent.was = permanent->link;
updateOldPermanent.now = *permanent; updateOldPermanent.now = *permanent;
updateOldPermanent.now->revoked = true; updateOldPermanent.now->revoked = true;
@ -549,7 +578,7 @@ void InviteLinks::notify(not_null<PeerData*> peer) {
Data::PeerUpdate::Flag::InviteLinks); Data::PeerUpdate::Flag::InviteLinks);
} }
auto InviteLinks::links(not_null<PeerData*> peer) const -> const Links & { auto InviteLinks::myLinks(not_null<PeerData*> peer) const -> const Links & {
static const auto kEmpty = Links(); static const auto kEmpty = Links();
const auto i = _firstSlices.find(peer); const auto i = _firstSlices.find(peer);
return (i != end(_firstSlices)) ? i->second : kEmpty; return (i != end(_firstSlices)) ? i->second : kEmpty;
@ -596,6 +625,7 @@ auto InviteLinks::parse(
void InviteLinks::requestMoreLinks( void InviteLinks::requestMoreLinks(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
TimeId lastDate, TimeId lastDate,
const QString &lastLink, const QString &lastLink,
bool revoked, bool revoked,
@ -605,14 +635,12 @@ void InviteLinks::requestMoreLinks(
MTP_flags(Flag::f_offset_link MTP_flags(Flag::f_offset_link
| (revoked ? Flag::f_revoked : Flag(0))), | (revoked ? Flag::f_revoked : Flag(0))),
peer->input, peer->input,
MTP_inputUserSelf(), admin->inputUser,
MTP_int(lastDate), MTP_int(lastDate),
MTP_string(lastLink), MTP_string(lastLink),
MTP_int(kPerPage) MTP_int(kPerPage)
)).done([=](const MTPmessages_ExportedChatInvites &result) { )).done([=](const MTPmessages_ExportedChatInvites &result) {
auto slice = parseSlice(peer, result); done(parseSlice(peer, result));
RemovePermanent(slice);
done(std::move(slice));
}).fail([=](const RPCError &error) { }).fail([=](const RPCError &error) {
done(Links()); done(Links());
}).send(); }).send();

18
Telegram/SourceFiles/api/api_invite_links.h
View file

@ -40,6 +40,7 @@ struct JoinedByLinkSlice {
struct InviteLinkUpdate { struct InviteLinkUpdate {
not_null<PeerData*> peer; not_null<PeerData*> peer;
not_null<UserData*> admin;
QString was; QString was;
std::optional<InviteLink> now; std::optional<InviteLink> now;
}; };
@ -63,32 +64,38 @@ public:
int usageLimit = 0); int usageLimit = 0);
void edit( void edit(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
TimeId expireDate, TimeId expireDate,
int usageLimit, int usageLimit,
Fn<void(Link)> done = nullptr); Fn<void(Link)> done = nullptr);
void revoke( void revoke(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
Fn<void(Link)> done = nullptr); Fn<void(Link)> done = nullptr);
void revokePermanent( void revokePermanent(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link,
Fn<void()> done = nullptr); Fn<void()> done = nullptr);
void destroy( void destroy(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
Fn<void()> done = nullptr); Fn<void()> done = nullptr);
void destroyAllRevoked( void destroyAllRevoked(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
Fn<void()> done = nullptr); Fn<void()> done = nullptr);
void setPermanent( void setMyPermanent(
not_null<PeerData*> peer, not_null<PeerData*> peer,
const MTPExportedChatInvite &invite); const MTPExportedChatInvite &invite);
void clearPermanent(not_null<PeerData*> peer); void clearMyPermanent(not_null<PeerData*> peer);
void requestLinks(not_null<PeerData*> peer); void requestMyLinks(not_null<PeerData*> peer);
[[nodiscard]] const Links &links(not_null<PeerData*> peer) const; [[nodiscard]] const Links &myLinks(not_null<PeerData*> peer) const;
[[nodiscard]] rpl::producer<JoinedByLinkSlice> joinedFirstSliceValue( [[nodiscard]] rpl::producer<JoinedByLinkSlice> joinedFirstSliceValue(
not_null<PeerData*> peer, not_null<PeerData*> peer,
@ -104,6 +111,7 @@ public:
void requestMoreLinks( void requestMoreLinks(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
TimeId lastDate, TimeId lastDate,
const QString &lastLink, const QString &lastLink,
bool revoked, bool revoked,
@ -135,6 +143,7 @@ private:
[[nodiscard]] const Link *lookupPermanent(const Links &links) const; [[nodiscard]] const Link *lookupPermanent(const Links &links) const;
Link prepend( Link prepend(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const MTPExportedChatInvite &invite); const MTPExportedChatInvite &invite);
void notify(not_null<PeerData*> peer); void notify(not_null<PeerData*> peer);
@ -144,6 +153,7 @@ private:
void performEdit( void performEdit(
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link, const QString &link,
Fn<void(Link)> done, Fn<void(Link)> done,
bool revoke, bool revoke,

6
Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
View file

@ -1002,18 +1002,18 @@ void Controller::fillManageSection() {
Info::Profile::MigratedOrMeValue( Info::Profile::MigratedOrMeValue(
_peer _peer
) | rpl::map([=](not_null<PeerData*> peer) { ) | rpl::map([=](not_null<PeerData*> peer) {
peer->session().api().inviteLinks().requestLinks(peer); peer->session().api().inviteLinks().requestMyLinks(peer);
return peer->session().changes().peerUpdates( return peer->session().changes().peerUpdates(
peer, peer,
Data::PeerUpdate::Flag::InviteLinks Data::PeerUpdate::Flag::InviteLinks
) | rpl::map([=] { ) | rpl::map([=] {
return peer->session().api().inviteLinks().links( return peer->session().api().inviteLinks().myLinks(
peer).count; peer).count;
}); });
}) | rpl::flatten_latest( }) | rpl::flatten_latest(
) | ToPositiveNumberString(), ) | ToPositiveNumberString(),
[=] { Ui::show( [=] { Ui::show(
Box(ManageInviteLinksBox, _peer), Box(ManageInviteLinksBox, _peer, _peer->session().user()),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
}, },
st::infoIconInviteLinks); st::infoIconInviteLinks);

86
Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
View file

@ -102,7 +102,7 @@ void AddHeaderBlock(
ShareInviteLinkBox(peer, link); ShareInviteLinkBox(peer, link);
}); });
const auto revokeLink = crl::guard(weak, [=] { const auto revokeLink = crl::guard(weak, [=] {
RevokeLink(peer, link); RevokeLink(peer, data.admin, data.link);
}); });
const auto createMenu = [=] { const auto createMenu = [=] {
@ -285,33 +285,44 @@ Main::Session &SingleRowController::session() const {
void AddPermanentLinkBlock( void AddPermanentLinkBlock(
not_null<Ui::VerticalLayout*> container, not_null<Ui::VerticalLayout*> container,
not_null<PeerData*> peer) { not_null<PeerData*> peer,
const auto computePermanentLink = [=] { not_null<UserData*> admin,
const auto &links = peer->session().api().inviteLinks().links( rpl::producer<Api::InviteLink> fromList) {
peer).links; struct LinkData {
const auto link = links.empty() ? nullptr : &links.front(); QString link;
return (link && link->permanent && !link->revoked) ? link : nullptr; int usage = 0;
}; };
auto value = peer->session().changes().peerFlagsValue( const auto value = container->lifetime().make_state<
peer, rpl::variable<LinkData>
Data::PeerUpdate::Flag::InviteLinks >();
) | rpl::map([=] { if (admin->isSelf()) {
const auto link = computePermanentLink(); *value = peer->session().changes().peerFlagsValue(
return link peer,
? std::make_tuple(link->link, link->usage) Data::PeerUpdate::Flag::InviteLinks
: std::make_tuple(QString(), 0); ) | rpl::map([=] {
}) | rpl::distinct_until_changed( const auto &links = peer->session().api().inviteLinks().myLinks(
) | rpl::start_spawning(container->lifetime()); peer).links;
const auto link = links.empty() ? nullptr : &links.front();
return (link && link->permanent && !link->revoked)
? LinkData{ link->link, link->usage }
: LinkData();
});
} else {
*value = std::move(
fromList
) | rpl::map([](const Api::InviteLink &link) {
return LinkData{ link.link, link.usage };
});
}
const auto weak = Ui::MakeWeak(container); const auto weak = Ui::MakeWeak(container);
const auto copyLink = crl::guard(weak, [=] { const auto copyLink = crl::guard(weak, [=] {
if (const auto link = computePermanentLink()) { if (const auto current = value->current(); !current.link.isEmpty()) {
CopyInviteLink(link->link); CopyInviteLink(current.link);
} }
}); });
const auto shareLink = crl::guard(weak, [=] { const auto shareLink = crl::guard(weak, [=] {
if (const auto link = computePermanentLink()) { if (const auto current = value->current(); !current.link.isEmpty()) {
ShareInviteLinkBox(peer, link->link); ShareInviteLinkBox(peer, current.link);
} }
}); });
const auto revokeLink = crl::guard(weak, [=] { const auto revokeLink = crl::guard(weak, [=] {
@ -322,18 +333,23 @@ void AddPermanentLinkBlock(
(*box)->closeBox(); (*box)->closeBox();
} }
}; };
peer->session().api().inviteLinks().revokePermanent(peer, close); peer->session().api().inviteLinks().revokePermanent(
peer,
admin,
value->current().link,
close);
}); });
*box = Ui::show( *box = Ui::show(
Box<ConfirmBox>(tr::lng_group_invite_about_new(tr::now), done), Box<ConfirmBox>(tr::lng_group_invite_about_new(tr::now), done),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
}); });
auto link = rpl::duplicate( auto link = value->value(
value ) | rpl::map([=](const LinkData &data) {
) | rpl::map([=](QString link, int usage) {
const auto prefix = qstr("https://"); const auto prefix = qstr("https://");
return link.startsWith(prefix) ? link.mid(prefix.size()) : link; return data.link.startsWith(prefix)
? data.link.mid(prefix.size())
: data.link;
}); });
const auto createMenu = [=] { const auto createMenu = [=] {
auto result = base::make_unique_q<Ui::PopupMenu>(container); auto result = base::make_unique_q<Ui::PopupMenu>(container);
@ -389,13 +405,12 @@ void AddPermanentLinkBlock(
.userpics = state->cachedUserpics .userpics = state->cachedUserpics
}; };
}; };
std::move( value->value(
value ) | rpl::map([=](const LinkData &data) {
) | rpl::map([=](QString link, int usage) {
return peer->session().api().inviteLinks().joinedFirstSliceValue( return peer->session().api().inviteLinks().joinedFirstSliceValue(
peer, peer,
link, data.link,
usage); data.usage);
}) | rpl::flatten_latest( }) | rpl::flatten_latest(
) | rpl::start_with_next([=](const Api::JoinedByLinkSlice &slice) { ) | rpl::start_with_next([=](const Api::JoinedByLinkSlice &slice) {
auto list = std::vector<HistoryView::UserpicInRow>(); auto list = std::vector<HistoryView::UserpicInRow>();
@ -540,7 +555,10 @@ void ShareInviteLinkBox(not_null<PeerData*> peer, const QString &link) {
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
} }
void RevokeLink(not_null<PeerData*> peer, const QString &link) { void RevokeLink(
not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link) {
const auto box = std::make_shared<QPointer<ConfirmBox>>(); const auto box = std::make_shared<QPointer<ConfirmBox>>();
const auto revoke = [=] { const auto revoke = [=] {
const auto done = [=](const LinkData &data) { const auto done = [=](const LinkData &data) {
@ -548,7 +566,7 @@ void RevokeLink(not_null<PeerData*> peer, const QString &link) {
(*box)->closeBox(); (*box)->closeBox();
} }
}; };
peer->session().api().inviteLinks().revoke(peer, link, done); peer->session().api().inviteLinks().revoke(peer, admin, link, done);
}; };
*box = Ui::show( *box = Ui::show(
Box<ConfirmBox>( Box<ConfirmBox>(

9
Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
View file

@ -21,11 +21,16 @@ class VerticalLayout;
void AddPermanentLinkBlock( void AddPermanentLinkBlock(
not_null<Ui::VerticalLayout*> container, not_null<Ui::VerticalLayout*> container,
not_null<PeerData*> peer); not_null<PeerData*> peer,
not_null<UserData*> admin,
rpl::producer<Api::InviteLink> fromList);
void CopyInviteLink(const QString &link); void CopyInviteLink(const QString &link);
void ShareInviteLinkBox(not_null<PeerData*> peer, const QString &link); void ShareInviteLinkBox(not_null<PeerData*> peer, const QString &link);
void RevokeLink(not_null<PeerData*> peer, const QString &link); void RevokeLink(
not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link);
void ShowInviteLinkBox( void ShowInviteLinkBox(
not_null<PeerData*> peer, not_null<PeerData*> peer,

284
Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
View file

@ -8,6 +8,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peers/edit_peer_invite_links.h" #include "boxes/peers/edit_peer_invite_links.h"
#include "data/data_peer.h" #include "data/data_peer.h"
#include "data/data_user.h"
#include "data/data_chat.h"
#include "data/data_channel.h"
#include "data/data_session.h"
#include "main/main_session.h" #include "main/main_session.h"
#include "api/api_invite_links.h" #include "api/api_invite_links.h"
#include "ui/boxes/edit_invite_link.h" #include "ui/boxes/edit_invite_link.h"
@ -167,7 +171,9 @@ private:
return result; return result;
} }
void EditLink(not_null<PeerData*> peer, const InviteLinkData &data) { void EditLink(
not_null<PeerData*> peer,
const InviteLinkData &data) {
const auto creating = data.link.isEmpty(); const auto creating = data.link.isEmpty();
const auto box = std::make_shared<QPointer<Ui::GenericBox>>(); const auto box = std::make_shared<QPointer<Ui::GenericBox>>();
using Fields = Ui::InviteLinkFields; using Fields = Ui::InviteLinkFields;
@ -181,6 +187,7 @@ void EditLink(not_null<PeerData*> peer, const InviteLinkData &data) {
} }
}; };
if (creating) { if (creating) {
Assert(data.admin->isSelf());
peer->session().api().inviteLinks().create( peer->session().api().inviteLinks().create(
peer, peer,
finish, finish,
@ -189,6 +196,7 @@ void EditLink(not_null<PeerData*> peer, const InviteLinkData &data) {
} else { } else {
peer->session().api().inviteLinks().edit( peer->session().api().inviteLinks().edit(
peer, peer,
data.admin,
result.link, result.link,
result.expireDate, result.expireDate,
result.usageLimit, result.usageLimit,
@ -209,7 +217,10 @@ void EditLink(not_null<PeerData*> peer, const InviteLinkData &data) {
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
} }
void DeleteLink(not_null<PeerData*> peer, const QString &link) { void DeleteLink(
not_null<PeerData*> peer,
not_null<UserData*> admin,
const QString &link) {
const auto box = std::make_shared<QPointer<ConfirmBox>>(); const auto box = std::make_shared<QPointer<ConfirmBox>>();
const auto sure = [=] { const auto sure = [=] {
const auto finish = [=] { const auto finish = [=] {
@ -217,14 +228,20 @@ void DeleteLink(not_null<PeerData*> peer, const QString &link) {
(*box)->closeBox(); (*box)->closeBox();
} }
}; };
peer->session().api().inviteLinks().destroy(peer, link, finish); peer->session().api().inviteLinks().destroy(
peer,
admin,
link,
finish);
}; };
*box = Ui::show( *box = Ui::show(
Box<ConfirmBox>(tr::lng_group_invite_delete_sure(tr::now), sure), Box<ConfirmBox>(tr::lng_group_invite_delete_sure(tr::now), sure),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
} }
void DeleteAllRevoked(not_null<PeerData*> peer) { void DeleteAllRevoked(
not_null<PeerData*> peer,
not_null<UserData*> admin) {
const auto box = std::make_shared<QPointer<ConfirmBox>>(); const auto box = std::make_shared<QPointer<ConfirmBox>>();
const auto sure = [=] { const auto sure = [=] {
const auto finish = [=] { const auto finish = [=] {
@ -232,7 +249,10 @@ void DeleteAllRevoked(not_null<PeerData*> peer) {
(*box)->closeBox(); (*box)->closeBox();
} }
}; };
peer->session().api().inviteLinks().destroyAllRevoked(peer, finish); peer->session().api().inviteLinks().destroyAllRevoked(
peer,
admin,
finish);
}; };
*box = Ui::show( *box = Ui::show(
Box<ConfirmBox>(tr::lng_group_invite_delete_all_sure(tr::now), sure), Box<ConfirmBox>(tr::lng_group_invite_delete_all_sure(tr::now), sure),
@ -365,12 +385,15 @@ void Row::paintAction(
: st::inviteLinkThreeDotsIcon).paint(p, x, y, outerWidth); : st::inviteLinkThreeDotsIcon).paint(p, x, y, outerWidth);
} }
class Controller final class LinksController final
: public PeerListController : public PeerListController
, public RowDelegate , public RowDelegate
, public base::has_weak_ptr { , public base::has_weak_ptr {
public: public:
Controller(not_null<PeerData*> peer, bool revoked); LinksController(
not_null<PeerData*> peer,
not_null<UserData*> admin,
bool revoked);
void prepare() override; void prepare() override;
void loadMoreRows() override; void loadMoreRows() override;
@ -390,6 +413,10 @@ public:
float64 progress, float64 progress,
Color color) override; Color color) override;
[[nodiscard]] rpl::producer<InviteLinkData> permanentFound() const {
return _permanentFound.events();
}
private: private:
void appendRow(const InviteLinkData &data, TimeId now); void appendRow(const InviteLinkData &data, TimeId now);
void prependRow(const InviteLinkData &data, TimeId now); void prependRow(const InviteLinkData &data, TimeId now);
@ -405,6 +432,7 @@ private:
not_null<PeerListRow*> row); not_null<PeerListRow*> row);
const not_null<PeerData*> _peer; const not_null<PeerData*> _peer;
const not_null<UserData*> _admin;
const bool _revoked = false; const bool _revoked = false;
base::unique_qptr<Ui::PopupMenu> _menu; base::unique_qptr<Ui::PopupMenu> _menu;
@ -413,6 +441,7 @@ private:
bool _requesting = false; bool _requesting = false;
bool _allLoaded = false; bool _allLoaded = false;
rpl::event_stream<InviteLinkData> _permanentFound;
base::flat_set<not_null<Row*>> _expiringRows; base::flat_set<not_null<Row*>> _expiringRows;
base::Timer _updateExpiringTimer; base::Timer _updateExpiringTimer;
@ -421,8 +450,12 @@ private:
}; };
Controller::Controller(not_null<PeerData*> peer, bool revoked) LinksController::LinksController(
not_null<PeerData*> peer,
not_null<UserData*> admin,
bool revoked)
: _peer(peer) : _peer(peer)
, _admin(admin)
, _revoked(revoked) , _revoked(revoked)
, _updateExpiringTimer([=] { expiringProgressTimer(); }) { , _updateExpiringTimer([=] { expiringProgressTimer(); }) {
style::PaletteChanged( style::PaletteChanged(
@ -464,16 +497,16 @@ Controller::Controller(not_null<PeerData*> peer, bool revoked)
} }
} }
void Controller::prepare() { void LinksController::prepare() {
if (!_revoked) { if (!_revoked && _admin->isSelf()) {
appendSlice(_peer->session().api().inviteLinks().links(_peer)); appendSlice(_peer->session().api().inviteLinks().myLinks(_peer));
} }
if (!delegate()->peerListFullRowsCount()) { if (!delegate()->peerListFullRowsCount()) {
loadMoreRows(); loadMoreRows();
} }
} }
void Controller::loadMoreRows() { void LinksController::loadMoreRows() {
if (_requesting || _allLoaded) { if (_requesting || _allLoaded) {
return; return;
} }
@ -491,16 +524,19 @@ void Controller::loadMoreRows() {
}; };
_peer->session().api().inviteLinks().requestMoreLinks( _peer->session().api().inviteLinks().requestMoreLinks(
_peer, _peer,
_admin,
_offsetDate, _offsetDate,
_offsetLink, _offsetLink,
_revoked, _revoked,
crl::guard(this, done)); crl::guard(this, done));
} }
void Controller::appendSlice(const InviteLinksSlice &slice) { void LinksController::appendSlice(const InviteLinksSlice &slice) {
const auto now = base::unixtime::now(); const auto now = base::unixtime::now();
for (const auto &link : slice.links) { for (const auto &link : slice.links) {
if (!link.permanent || link.revoked) { if (link.permanent && !link.revoked) {
_permanentFound.fire_copy(link);
} else {
appendRow(link, now); appendRow(link, now);
} }
_offsetLink = link.link; _offsetLink = link.link;
@ -512,15 +548,15 @@ void Controller::appendSlice(const InviteLinksSlice &slice) {
delegate()->peerListRefreshRows(); delegate()->peerListRefreshRows();
} }
void Controller::rowClicked(not_null<PeerListRow*> row) { void LinksController::rowClicked(not_null<PeerListRow*> row) {
ShowInviteLinkBox(_peer, static_cast<Row*>(row.get())->data()); ShowInviteLinkBox(_peer, static_cast<Row*>(row.get())->data());
} }
void Controller::rowActionClicked(not_null<PeerListRow*> row) { void LinksController::rowActionClicked(not_null<PeerListRow*> row) {
delegate()->peerListShowRowMenu(row, nullptr); delegate()->peerListShowRowMenu(row, nullptr);
} }
base::unique_qptr<Ui::PopupMenu> Controller::rowContextMenu( base::unique_qptr<Ui::PopupMenu> LinksController::rowContextMenu(
QWidget *parent, QWidget *parent,
not_null<PeerListRow*> row) { not_null<PeerListRow*> row) {
auto result = createRowContextMenu(parent, row); auto result = createRowContextMenu(parent, row);
@ -537,7 +573,7 @@ base::unique_qptr<Ui::PopupMenu> Controller::rowContextMenu(
return result; return result;
} }
base::unique_qptr<Ui::PopupMenu> Controller::createRowContextMenu( base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
QWidget *parent, QWidget *parent,
not_null<PeerListRow*> row) { not_null<PeerListRow*> row) {
const auto real = static_cast<Row*>(row.get()); const auto real = static_cast<Row*>(row.get());
@ -546,7 +582,7 @@ base::unique_qptr<Ui::PopupMenu> Controller::createRowContextMenu(
auto result = base::make_unique_q<Ui::PopupMenu>(parent); auto result = base::make_unique_q<Ui::PopupMenu>(parent);
if (data.revoked) { if (data.revoked) {
result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] { result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] {
DeleteLink(_peer, link); DeleteLink(_peer, _admin, link);
}); });
} else { } else {
result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] { result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {
@ -559,25 +595,25 @@ base::unique_qptr<Ui::PopupMenu> Controller::createRowContextMenu(
EditLink(_peer, data); EditLink(_peer, data);
}); });
result->addAction(tr::lng_group_invite_context_revoke(tr::now), [=] { result->addAction(tr::lng_group_invite_context_revoke(tr::now), [=] {
RevokeLink(_peer, link); RevokeLink(_peer, _admin, link);
}); });
} }
return result; return result;
} }
Main::Session &Controller::session() const { Main::Session &LinksController::session() const {
return _peer->session(); return _peer->session();
} }
void Controller::appendRow(const InviteLinkData &data, TimeId now) { void LinksController::appendRow(const InviteLinkData &data, TimeId now) {
delegate()->peerListAppendRow(std::make_unique<Row>(this, data, now)); delegate()->peerListAppendRow(std::make_unique<Row>(this, data, now));
} }
void Controller::prependRow(const InviteLinkData &data, TimeId now) { void LinksController::prependRow(const InviteLinkData &data, TimeId now) {
delegate()->peerListPrependRow(std::make_unique<Row>(this, data, now)); delegate()->peerListPrependRow(std::make_unique<Row>(this, data, now));
} }
void Controller::updateRow(const InviteLinkData &data, TimeId now) { void LinksController::updateRow(const InviteLinkData &data, TimeId now) {
if (const auto row = delegate()->peerListFindRow(ComputeRowId(data))) { if (const auto row = delegate()->peerListFindRow(ComputeRowId(data))) {
const auto real = static_cast<Row*>(row); const auto real = static_cast<Row*>(row);
real->update(data, now); real->update(data, now);
@ -588,7 +624,7 @@ void Controller::updateRow(const InviteLinkData &data, TimeId now) {
} }
} }
bool Controller::removeRow(const QString &link) { bool LinksController::removeRow(const QString &link) {
if (const auto row = delegate()->peerListFindRow(ComputeRowId(link))) { if (const auto row = delegate()->peerListFindRow(ComputeRowId(link))) {
delegate()->peerListRemoveRow(row); delegate()->peerListRemoveRow(row);
return true; return true;
@ -596,7 +632,7 @@ bool Controller::removeRow(const QString &link) {
return false; return false;
} }
void Controller::checkExpiringTimer(not_null<Row*> row) { void LinksController::checkExpiringTimer(not_null<Row*> row) {
const auto updateIn = row->updateExpireIn(); const auto updateIn = row->updateExpireIn();
if (updateIn > 0) { if (updateIn > 0) {
_expiringRows.emplace(row); _expiringRows.emplace(row);
@ -609,7 +645,7 @@ void Controller::checkExpiringTimer(not_null<Row*> row) {
} }
} }
void Controller::expiringProgressTimer() { void LinksController::expiringProgressTimer() {
const auto now = base::unixtime::now(); const auto now = base::unixtime::now();
auto minimalIn = 0; auto minimalIn = 0;
for (auto i = begin(_expiringRows); i != end(_expiringRows);) { for (auto i = begin(_expiringRows); i != end(_expiringRows);) {
@ -629,11 +665,11 @@ void Controller::expiringProgressTimer() {
} }
} }
void Controller::rowUpdateRow(not_null<Row*> row) { void LinksController::rowUpdateRow(not_null<Row*> row) {
delegate()->peerListUpdateRow(row); delegate()->peerListUpdateRow(row);
} }
void Controller::rowPaintIcon( void LinksController::rowPaintIcon(
QPainter &p, QPainter &p,
int x, int x,
int y, int y,
@ -650,7 +686,7 @@ void Controller::rowPaintIcon(
case Color::Expired: return &st::msgFile3Bg; case Color::Expired: return &st::msgFile3Bg;
case Color::Revoked: return &st::windowSubTextFg; case Color::Revoked: return &st::windowSubTextFg;
} }
Unexpected("Color in Controller::rowPaintIcon."); Unexpected("Color in LinksController::rowPaintIcon.");
}(); }();
auto &icon = _icons[int(color)]; auto &icon = _icons[int(color)];
if (icon.isNull()) { if (icon.isNull()) {
@ -687,17 +723,111 @@ void Controller::rowPaintIcon(
} }
} }
class AdminsController final
: public PeerListController
, public base::has_weak_ptr {
public:
AdminsController(not_null<PeerData*> peer, not_null<UserData*> admin);
~AdminsController();
void prepare() override;
void loadMoreRows() override;
void rowClicked(not_null<PeerListRow*> row) override;
Main::Session &session() const override;
private:
void appendRow(not_null<UserData*> user, int count);
const not_null<PeerData*> _peer;
const not_null<UserData*> _admin;
mtpRequestId _requestId = 0;
};
AdminsController::AdminsController(
not_null<PeerData*> peer,
not_null<UserData*> admin)
: _peer(peer)
, _admin(admin) {
}
AdminsController::~AdminsController() {
session().api().request(base::take(_requestId)).cancel();
}
void AdminsController::prepare() {
if (const auto chat = _peer->asChat()) {
if (!chat->amCreator()) {
return;
}
} else if (const auto channel = _peer->asChannel()) {
if (!channel->amCreator()) {
return;
}
}
if (!_admin->isSelf()) {
return;
}
_requestId = session().api().request(MTPmessages_GetAdminsWithInvites(
_peer->input
)).done([=](const MTPmessages_ChatAdminsWithInvites &result) {
result.match([&](const MTPDmessages_chatAdminsWithInvites &data) {
auto &owner = _peer->owner();
owner.processUsers(data.vusers());
for (const auto &admin : data.vadmins().v) {
admin.match([&](const MTPDchatAdminWithInvites &data) {
const auto adminId = data.vadmin_id().v;
if (const auto user = owner.userLoaded(adminId)) {
if (!user->isSelf()) {
appendRow(user, data.vinvites_count().v);
}
}
});
}
delegate()->peerListRefreshRows();
});
}).send();
}
void AdminsController::loadMoreRows() {
}
void AdminsController::rowClicked(not_null<PeerListRow*> row) {
Ui::show(
Box(ManageInviteLinksBox, _peer, row->peer()->asUser()),
Ui::LayerOption::KeepOther);
}
Main::Session &AdminsController::session() const {
return _peer->session();
}
void AdminsController::appendRow(not_null<UserData*> user, int count) {
auto row = std::make_unique<PeerListRow>(user);
row->setCustomStatus(
tr::lng_group_invite_other_count(tr::now, lt_count, count));
delegate()->peerListAppendRow(std::move(row));
}
} // namespace } // namespace
not_null<Ui::RpWidget*> AddLinksList( struct LinksList {
not_null<Ui::RpWidget*> widget;
rpl::producer<InviteLinkData> permanentFound;
};
LinksList AddLinksList(
not_null<Ui::VerticalLayout*> container, not_null<Ui::VerticalLayout*> container,
not_null<PeerData*> peer, not_null<PeerData*> peer,
not_null<UserData*> admin,
bool revoked) { bool revoked) {
const auto delegate = container->lifetime().make_state< auto &lifetime = container->lifetime();
const auto delegate = lifetime.make_state<
PeerListContentDelegateSimple PeerListContentDelegateSimple
>(); >();
const auto controller = container->lifetime().make_state<Controller>( const auto controller = lifetime.make_state<LinksController>(
peer, peer,
admin,
revoked); revoked);
controller->setStyleOverrides(&st::inviteLinkList); controller->setStyleOverrides(&st::inviteLinkList);
const auto content = container->add(object_ptr<PeerListContent>( const auto content = container->add(object_ptr<PeerListContent>(
@ -706,27 +836,67 @@ not_null<Ui::RpWidget*> AddLinksList(
delegate->setContent(content); delegate->setContent(content);
controller->setDelegate(delegate); controller->setDelegate(delegate);
return { content, controller->permanentFound() };
}
not_null<Ui::RpWidget*> AddAdminsList(
not_null<Ui::VerticalLayout*> container,
not_null<PeerData*> peer,
not_null<UserData*> admin) {
auto &lifetime = container->lifetime();
const auto delegate = lifetime.make_state<
PeerListContentDelegateSimple
>();
const auto controller = lifetime.make_state<AdminsController>(
peer,
admin);
controller->setStyleOverrides(&st::inviteLinkList);
const auto content = container->add(object_ptr<PeerListContent>(
container,
controller));
delegate->setContent(content);
controller->setDelegate(delegate);
return content; return content;
} }
void ManageInviteLinksBox( void ManageInviteLinksBox(
not_null<Ui::GenericBox*> box, not_null<Ui::GenericBox*> box,
not_null<PeerData*> peer) { not_null<PeerData*> peer,
not_null<UserData*> admin) {
using namespace Settings; using namespace Settings;
box->setTitle(tr::lng_group_invite_title()); box->setTitle(tr::lng_group_invite_title());
const auto container = box->verticalLayout(); const auto container = box->verticalLayout();
const auto permanentFromList = box->lifetime().make_state<
rpl::event_stream<InviteLinkData>
>();
AddSubsectionTitle(container, tr::lng_create_permanent_link_title()); AddSubsectionTitle(container, tr::lng_create_permanent_link_title());
AddPermanentLinkBlock(container, peer); AddPermanentLinkBlock(
container,
peer,
admin,
permanentFromList->events());
AddDivider(container); AddDivider(container);
const auto add = AddCreateLinkButton(container); if (admin->isSelf()) {
add->setClickedCallback([=] { const auto add = AddCreateLinkButton(container);
EditLink(peer, InviteLinkData{ .admin = peer->session().user() }); add->setClickedCallback([=] {
}); EditLink(peer, InviteLinkData{ .admin = admin });
});
} else {
AddSubsectionTitle(container, tr::lng_group_invite_other_list());
}
auto [list, newPermanent] = AddLinksList(container, peer, admin, false);
std::move(
newPermanent
) | rpl::start_with_next([=](InviteLinkData &&data) {
permanentFromList->fire(std::move(data));
}, container->lifetime());
const auto list = AddLinksList(container, peer, false);
const auto dividerAbout = container->add(object_ptr<Ui::SlideWrap<>>( const auto dividerAbout = container->add(object_ptr<Ui::SlideWrap<>>(
container, container,
object_ptr<Ui::DividerLabel>( object_ptr<Ui::DividerLabel>(
@ -737,24 +907,37 @@ void ManageInviteLinksBox(
st::boxDividerLabel), st::boxDividerLabel),
st::settingsDividerLabelPadding)), st::settingsDividerLabelPadding)),
style::margins(0, st::inviteLinkCreateSkip, 0, 0)); style::margins(0, st::inviteLinkCreateSkip, 0, 0));
const auto divider = container->add(object_ptr<Ui::SlideWrap<>>(
const auto adminsDivider = container->add(object_ptr<Ui::SlideWrap<>>(
container, container,
object_ptr<Ui::BoxContentDivider>(container))); object_ptr<Ui::BoxContentDivider>(container)));
const auto header = container->add(object_ptr<Ui::SlideWrap<>>( const auto adminsHeader = container->add(object_ptr<Ui::SlideWrap<>>(
container,
object_ptr<Ui::FlatLabel>(
container,
tr::lng_group_invite_other_title(),
st::settingsSubsectionTitle),
st::inviteLinkRevokedTitlePadding));
const auto admins = AddAdminsList(container, peer, admin);
const auto revokedDivider = container->add(object_ptr<Ui::SlideWrap<>>(
container,
object_ptr<Ui::BoxContentDivider>(container)));
const auto revokedHeader = container->add(object_ptr<Ui::SlideWrap<>>(
container, container,
object_ptr<Ui::FlatLabel>( object_ptr<Ui::FlatLabel>(
container, container,
tr::lng_group_invite_revoked_title(), tr::lng_group_invite_revoked_title(),
st::settingsSubsectionTitle), st::settingsSubsectionTitle),
st::inviteLinkRevokedTitlePadding)); st::inviteLinkRevokedTitlePadding));
const auto revoked = AddLinksList(container, peer, true); const auto revoked = AddLinksList(container, peer, admin, true).widget;
const auto deleteAll = Ui::CreateChild<Ui::LinkButton>( const auto deleteAll = Ui::CreateChild<Ui::LinkButton>(
container.get(), container.get(),
tr::lng_group_invite_context_delete_all(tr::now), tr::lng_group_invite_context_delete_all(tr::now),
st::defaultLinkButton); st::defaultLinkButton);
rpl::combine( rpl::combine(
header->topValue(), revokedHeader->topValue(),
container->widthValue() container->widthValue()
) | rpl::start_with_next([=](int top, int outerWidth) { ) | rpl::start_with_next([=](int top, int outerWidth) {
deleteAll->moveToRight( deleteAll->moveToRight(
@ -763,18 +946,21 @@ void ManageInviteLinksBox(
outerWidth); outerWidth);
}, deleteAll->lifetime()); }, deleteAll->lifetime());
deleteAll->setClickedCallback([=] { deleteAll->setClickedCallback([=] {
DeleteAllRevoked(peer); DeleteAllRevoked(peer, admin);
}); });
rpl::combine( rpl::combine(
list->heightValue(), list->heightValue(),
admins->heightValue(),
revoked->heightValue() revoked->heightValue()
) | rpl::start_with_next([=](int list, int revoked) { ) | rpl::start_with_next([=](int list, int admins, int revoked) {
dividerAbout->toggle(!list, anim::type::instant); dividerAbout->toggle(!list, anim::type::instant);
divider->toggle(list > 0 && revoked > 0, anim::type::instant); adminsDivider->toggle(admins > 0 && list > 0, anim::type::instant);
header->toggle(revoked > 0, anim::type::instant); adminsHeader->toggle(admins > 0, anim::type::instant);
revokedDivider->toggle(revoked > 0 && (list > 0 || admins > 0), anim::type::instant);
revokedHeader->toggle(revoked > 0, anim::type::instant);
deleteAll->setVisible(revoked > 0); deleteAll->setVisible(revoked > 0);
}, header->lifetime()); }, revokedHeader->lifetime());
box->addButton(tr::lng_about_done(), [=] { box->closeBox(); }); box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
} }

3
Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.h
View file

@ -13,4 +13,5 @@ class PeerData;
void ManageInviteLinksBox( void ManageInviteLinksBox(
not_null<Ui::GenericBox*> box, not_null<Ui::GenericBox*> box,
not_null<PeerData*> peer); not_null<PeerData*> peer,
not_null<UserData*> admin);

8
Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
View file

@ -193,7 +193,7 @@ void Controller::createContent() {
tr::lng_group_invite_manage(), tr::lng_group_invite_manage(),
rpl::single(QString()), rpl::single(QString()),
[=] { Ui::show( [=] { Ui::show(
Box(ManageInviteLinksBox, _peer), Box(ManageInviteLinksBox, _peer, _peer->session().user()),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
}, },
st::manageGroupButton, st::manageGroupButton,
@ -566,7 +566,11 @@ object_ptr<Ui::RpWidget> Controller::createInviteLinkBlock() {
AddSubsectionTitle(container, tr::lng_create_permanent_link_title()); AddSubsectionTitle(container, tr::lng_create_permanent_link_title());
} }
AddPermanentLinkBlock(container, _peer); AddPermanentLinkBlock(
container,
_peer,
_peer->session().user(),
nullptr);
AddSkip(container); AddSkip(container);

4
Telegram/SourceFiles/data/data_channel.cpp
View file

@ -776,11 +776,11 @@ void ApplyChannelUpdate(
next->v - channel->slowmodeSeconds()); next->v - channel->slowmodeSeconds());
} }
if (const auto invite = update.vexported_invite()) { if (const auto invite = update.vexported_invite()) {
channel->session().api().inviteLinks().setPermanent( channel->session().api().inviteLinks().setMyPermanent(
channel, channel,
*invite); *invite);
} else { } else {
channel->session().api().inviteLinks().clearPermanent(channel); channel->session().api().inviteLinks().clearMyPermanent(channel);
} }
if (const auto location = update.vlocation()) { if (const auto location = update.vlocation()) {
channel->setLocation(*location); channel->setLocation(*location);

4
Telegram/SourceFiles/data/data_chat.cpp
View file

@ -390,9 +390,9 @@ void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
chat->setUserpicPhoto(MTP_photoEmpty(MTP_long(0))); chat->setUserpicPhoto(MTP_photoEmpty(MTP_long(0)));
} }
if (const auto invite = update.vexported_invite()) { if (const auto invite = update.vexported_invite()) {
chat->session().api().inviteLinks().setPermanent(chat, *invite); chat->session().api().inviteLinks().setMyPermanent(chat, *invite);
} else { } else {
chat->session().api().inviteLinks().clearPermanent(chat); chat->session().api().inviteLinks().clearMyPermanent(chat);
} }
if (const auto pinned = update.vpinned_msg_id()) { if (const auto pinned = update.vpinned_msg_id()) {
SetTopPinnedMessageId(chat, pinned->v); SetTopPinnedMessageId(chat, pinned->v);