mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-07 15:43:55 +02:00
Added list of members to statistical info of supergroups.
This commit is contained in:
parent
79662dffa4
commit
2c1abd32bf
4 changed files with 274 additions and 14 deletions
|
@ -4083,6 +4083,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
"lng_stats_overview_message_public_share#one" = "{count} public share";
|
"lng_stats_overview_message_public_share#one" = "{count} public share";
|
||||||
"lng_stats_overview_message_public_share#other" = "{count} public shares";
|
"lng_stats_overview_message_public_share#other" = "{count} public shares";
|
||||||
|
|
||||||
|
"lng_stats_members_title" = "Top members";
|
||||||
|
"lng_stats_admins_title" = "Top admins";
|
||||||
|
"lng_stats_inviters_title" = "Top inviters";
|
||||||
|
"lng_stats_member_messages#one" = "{count} message";
|
||||||
|
"lng_stats_member_messages#other" = "{count} messages";
|
||||||
|
"lng_stats_member_characters#one" = "{count} symbol per message";
|
||||||
|
"lng_stats_member_characters#other" = "{count} symbols per message";
|
||||||
|
"lng_stats_member_deletions#one" = "{count} deletions";
|
||||||
|
"lng_stats_member_deletions#other" = "{count} deletions";
|
||||||
|
"lng_stats_member_bans#one" = "{count} ban";
|
||||||
|
"lng_stats_member_bans#other" = "{count} bans";
|
||||||
|
"lng_stats_member_restrictions#one" = "{count} restriction";
|
||||||
|
"lng_stats_member_restrictions#other" = "{count} restrictions";
|
||||||
|
"lng_stats_member_invitations#one" = "{count} invitation";
|
||||||
|
"lng_stats_member_invitations#other" = "{count} invitations";
|
||||||
|
|
||||||
"lng_stats_recent_messages_title" = "Recent posts";
|
"lng_stats_recent_messages_title" = "Recent posts";
|
||||||
"lng_stats_recent_messages_views#one" = "{count} view";
|
"lng_stats_recent_messages_views#one" = "{count} view";
|
||||||
"lng_stats_recent_messages_views#other" = "{count} views";
|
"lng_stats_recent_messages_views#other" = "{count} views";
|
||||||
|
|
|
@ -11,16 +11,53 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "boxes/peer_list_controllers.h"
|
#include "boxes/peer_list_controllers.h"
|
||||||
#include "data/data_channel.h"
|
#include "data/data_channel.h"
|
||||||
#include "data/data_session.h"
|
#include "data/data_session.h"
|
||||||
|
#include "data/data_user.h"
|
||||||
#include "history/history_item.h"
|
#include "history/history_item.h"
|
||||||
#include "lang/lang_keys.h"
|
#include "lang/lang_keys.h"
|
||||||
#include "main/main_session.h"
|
#include "main/main_session.h"
|
||||||
#include "settings/settings_common.h"
|
#include "settings/settings_common.h"
|
||||||
|
#include "ui/widgets/buttons.h"
|
||||||
|
#include "ui/wrap/slide_wrap.h"
|
||||||
#include "ui/wrap/vertical_layout.h"
|
#include "ui/wrap/vertical_layout.h"
|
||||||
#include "styles/style_settings.h"
|
#include "styles/style_settings.h"
|
||||||
|
|
||||||
namespace Info::Statistics {
|
namespace Info::Statistics {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
|
void AddSubsectionTitle(
|
||||||
|
not_null<Ui::VerticalLayout*> container,
|
||||||
|
rpl::producer<QString> title) {
|
||||||
|
const auto &subtitlePadding = st::settingsButton.padding;
|
||||||
|
::Settings::AddSubsectionTitle(
|
||||||
|
container,
|
||||||
|
std::move(title),
|
||||||
|
{ 0, -subtitlePadding.top(), 0, -subtitlePadding.bottom() });
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]] QString FormatText(
|
||||||
|
int value1, tr::phrase<lngtag_count> phrase1,
|
||||||
|
int value2, tr::phrase<lngtag_count> phrase2,
|
||||||
|
int value3, tr::phrase<lngtag_count> phrase3) {
|
||||||
|
const auto separator = u", "_q;
|
||||||
|
auto resultText = QString();
|
||||||
|
if (value1 > 0) {
|
||||||
|
resultText += phrase1(tr::now, lt_count, value1);
|
||||||
|
}
|
||||||
|
if (value2 > 0) {
|
||||||
|
if (!resultText.isEmpty()) {
|
||||||
|
resultText += separator;
|
||||||
|
}
|
||||||
|
resultText += phrase2(tr::now, lt_count, value2);
|
||||||
|
}
|
||||||
|
if (value3 > 0) {
|
||||||
|
if (!resultText.isEmpty()) {
|
||||||
|
resultText += separator;
|
||||||
|
}
|
||||||
|
resultText += phrase3(tr::now, lt_count, value3);
|
||||||
|
}
|
||||||
|
return resultText;
|
||||||
|
}
|
||||||
|
|
||||||
struct Descriptor final {
|
struct Descriptor final {
|
||||||
Api::PublicForwards::Slice firstSlice;
|
Api::PublicForwards::Slice firstSlice;
|
||||||
Fn<void(FullMsgId)> showPeerHistory;
|
Fn<void(FullMsgId)> showPeerHistory;
|
||||||
|
@ -28,6 +65,12 @@ struct Descriptor final {
|
||||||
FullMsgId contextId;
|
FullMsgId contextId;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct MembersDescriptor final {
|
||||||
|
not_null<Main::Session*> session;
|
||||||
|
Fn<void(not_null<PeerData*>)> showPeerInfo;
|
||||||
|
Data::SupergroupStatistics data;
|
||||||
|
};
|
||||||
|
|
||||||
class PeerListRowWithMsgId : public PeerListRow {
|
class PeerListRowWithMsgId : public PeerListRow {
|
||||||
public:
|
public:
|
||||||
using PeerListRow::PeerListRow;
|
using PeerListRow::PeerListRow;
|
||||||
|
@ -48,6 +91,103 @@ MsgId PeerListRowWithMsgId::msgId() const {
|
||||||
return _msgId;
|
return _msgId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class MembersController final : public PeerListController {
|
||||||
|
public:
|
||||||
|
MembersController(MembersDescriptor d);
|
||||||
|
|
||||||
|
Main::Session &session() const override;
|
||||||
|
void prepare() override;
|
||||||
|
void rowClicked(not_null<PeerListRow*> row) override;
|
||||||
|
void loadMoreRows() override;
|
||||||
|
|
||||||
|
void setLimit(int limit);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void addRows(int from, int to);
|
||||||
|
|
||||||
|
const not_null<Main::Session*> _session;
|
||||||
|
Fn<void(not_null<PeerData*>)> _showPeerInfo;
|
||||||
|
Data::SupergroupStatistics _data;
|
||||||
|
int _limit = 0;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
MembersController::MembersController(MembersDescriptor d)
|
||||||
|
: _session(std::move(d.session))
|
||||||
|
, _showPeerInfo(std::move(d.showPeerInfo))
|
||||||
|
, _data(std::move(d.data)) {
|
||||||
|
}
|
||||||
|
|
||||||
|
Main::Session &MembersController::session() const {
|
||||||
|
return *_session;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MembersController::setLimit(int limit) {
|
||||||
|
addRows(_limit, limit);
|
||||||
|
_limit = limit;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MembersController::addRows(int from, int to) {
|
||||||
|
const auto addRow = [&](UserId userId, QString text) {
|
||||||
|
const auto user = _session->data().user(userId);
|
||||||
|
auto row = std::make_unique<PeerListRow>(user);
|
||||||
|
row->setCustomStatus(std::move(text));
|
||||||
|
delegate()->peerListAppendRow(std::move(row));
|
||||||
|
};
|
||||||
|
if (!_data.topSenders.empty()) {
|
||||||
|
for (auto i = from; i < to; i++) {
|
||||||
|
const auto &member = _data.topSenders[i];
|
||||||
|
addRow(
|
||||||
|
member.userId,
|
||||||
|
FormatText(
|
||||||
|
member.sentMessageCount,
|
||||||
|
tr::lng_stats_member_messages,
|
||||||
|
member.averageCharacterCount,
|
||||||
|
tr::lng_stats_member_characters,
|
||||||
|
0,
|
||||||
|
{}));
|
||||||
|
}
|
||||||
|
} else if (!_data.topAdministrators.empty()) {
|
||||||
|
for (auto i = from; i < to; i++) {
|
||||||
|
const auto &admin = _data.topAdministrators[i];
|
||||||
|
addRow(
|
||||||
|
admin.userId,
|
||||||
|
FormatText(
|
||||||
|
admin.deletedMessageCount,
|
||||||
|
tr::lng_stats_member_deletions,
|
||||||
|
admin.bannedUserCount,
|
||||||
|
tr::lng_stats_member_bans,
|
||||||
|
admin.restrictedUserCount,
|
||||||
|
tr::lng_stats_member_restrictions));
|
||||||
|
}
|
||||||
|
} else if (!_data.topInviters.empty()) {
|
||||||
|
for (auto i = from; i < to; i++) {
|
||||||
|
const auto &inviter = _data.topInviters[i];
|
||||||
|
addRow(
|
||||||
|
inviter.userId,
|
||||||
|
FormatText(
|
||||||
|
inviter.addedMemberCount,
|
||||||
|
tr::lng_stats_member_invitations,
|
||||||
|
0,
|
||||||
|
{},
|
||||||
|
0,
|
||||||
|
{}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MembersController::prepare() {
|
||||||
|
}
|
||||||
|
|
||||||
|
void MembersController::loadMoreRows() {
|
||||||
|
}
|
||||||
|
|
||||||
|
void MembersController::rowClicked(not_null<PeerListRow*> row) {
|
||||||
|
crl::on_main([=, peer = row->peer()] {
|
||||||
|
_showPeerInfo(peer);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
class PublicForwardsController final : public PeerListController {
|
class PublicForwardsController final : public PeerListController {
|
||||||
public:
|
public:
|
||||||
explicit PublicForwardsController(Descriptor d);
|
explicit PublicForwardsController(Descriptor d);
|
||||||
|
@ -57,8 +197,6 @@ public:
|
||||||
void rowClicked(not_null<PeerListRow*> row) override;
|
void rowClicked(not_null<PeerListRow*> row) override;
|
||||||
void loadMoreRows() override;
|
void loadMoreRows() override;
|
||||||
|
|
||||||
[[nodiscard]] rpl::producer<int> totalCountChanges() const;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool appendRow(not_null<PeerData*> peer, MsgId msgId);
|
bool appendRow(not_null<PeerData*> peer, MsgId msgId);
|
||||||
void applySlice(const Api::PublicForwards::Slice &slice);
|
void applySlice(const Api::PublicForwards::Slice &slice);
|
||||||
|
@ -72,8 +210,6 @@ private:
|
||||||
|
|
||||||
bool _allLoaded = false;
|
bool _allLoaded = false;
|
||||||
|
|
||||||
rpl::event_stream<int> _totalCountChanges;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
PublicForwardsController::PublicForwardsController(Descriptor d)
|
PublicForwardsController::PublicForwardsController(Descriptor d)
|
||||||
|
@ -105,7 +241,6 @@ void PublicForwardsController::applySlice(
|
||||||
const Api::PublicForwards::Slice &slice) {
|
const Api::PublicForwards::Slice &slice) {
|
||||||
_allLoaded = slice.allLoaded;
|
_allLoaded = slice.allLoaded;
|
||||||
_apiToken = slice.token;
|
_apiToken = slice.token;
|
||||||
_totalCountChanges.fire_copy(slice.total);
|
|
||||||
|
|
||||||
for (const auto &item : slice.list) {
|
for (const auto &item : slice.list) {
|
||||||
if (const auto peer = session().data().peerLoaded(item.peer)) {
|
if (const auto peer = session().data().peerLoaded(item.peer)) {
|
||||||
|
@ -153,10 +288,6 @@ bool PublicForwardsController::appendRow(
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
rpl::producer<int> PublicForwardsController::totalCountChanges() const {
|
|
||||||
return _totalCountChanges.events();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
void AddPublicForwards(
|
void AddPublicForwards(
|
||||||
|
@ -183,13 +314,11 @@ void AddPublicForwards(
|
||||||
});
|
});
|
||||||
|
|
||||||
if (const auto total = firstSliceHolder.firstSlice().total; total > 0) {
|
if (const auto total = firstSliceHolder.firstSlice().total; total > 0) {
|
||||||
const auto &subtitlePadding = st::settingsButton.padding;
|
AddSubsectionTitle(
|
||||||
::Settings::AddSubsectionTitle(
|
|
||||||
container,
|
container,
|
||||||
tr::lng_stats_overview_message_public_share(
|
tr::lng_stats_overview_message_public_share(
|
||||||
lt_count_decimal,
|
lt_count_decimal,
|
||||||
rpl::single<float64>(total)),
|
rpl::single<float64>(total)));
|
||||||
{ 0, -subtitlePadding.top(), 0, -subtitlePadding.bottom() });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
state->delegate.setContent(container->add(
|
state->delegate.setContent(container->add(
|
||||||
|
@ -197,4 +326,66 @@ void AddPublicForwards(
|
||||||
state->controller.setDelegate(&state->delegate);
|
state->controller.setDelegate(&state->delegate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AddMembersList(
|
||||||
|
Data::SupergroupStatistics data,
|
||||||
|
not_null<Ui::VerticalLayout*> container,
|
||||||
|
Fn<void(not_null<PeerData*>)> showPeerInfo,
|
||||||
|
not_null<PeerData*> peer,
|
||||||
|
rpl::producer<QString> title) {
|
||||||
|
if (!peer->isMegagroup()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const auto max = !data.topSenders.empty()
|
||||||
|
? data.topSenders.size()
|
||||||
|
: !data.topAdministrators.empty()
|
||||||
|
? data.topAdministrators.size()
|
||||||
|
: !data.topInviters.empty()
|
||||||
|
? data.topInviters.size()
|
||||||
|
: 0;
|
||||||
|
if (!max) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr auto kPerPage = 40;
|
||||||
|
struct State final {
|
||||||
|
State(MembersDescriptor d) : controller(std::move(d)) {
|
||||||
|
}
|
||||||
|
PeerListContentDelegateSimple delegate;
|
||||||
|
MembersController controller;
|
||||||
|
int limit = 0;
|
||||||
|
};
|
||||||
|
auto d = MembersDescriptor{
|
||||||
|
&peer->session(),
|
||||||
|
std::move(showPeerInfo),
|
||||||
|
std::move(data),
|
||||||
|
};
|
||||||
|
const auto state = container->lifetime().make_state<State>(std::move(d));
|
||||||
|
|
||||||
|
AddSubsectionTitle(container, std::move(title));
|
||||||
|
|
||||||
|
state->delegate.setContent(container->add(
|
||||||
|
object_ptr<PeerListContent>(container, &state->controller)));
|
||||||
|
state->controller.setDelegate(&state->delegate);
|
||||||
|
|
||||||
|
const auto wrap = container->add(
|
||||||
|
object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
|
||||||
|
container,
|
||||||
|
object_ptr<Ui::SettingsButton>(
|
||||||
|
container,
|
||||||
|
tr::lng_stories_show_more())),
|
||||||
|
{ 0, -st::settingsButton.padding.top(), 0, 0 });
|
||||||
|
const auto button = wrap->entity();
|
||||||
|
|
||||||
|
const auto showMore = [=] {
|
||||||
|
state->limit = std::min(int(max), state->limit + kPerPage);
|
||||||
|
state->controller.setLimit(state->limit);
|
||||||
|
if (state->limit == max) {
|
||||||
|
wrap->toggle(false, anim::type::instant);
|
||||||
|
}
|
||||||
|
container->resizeToWidth(container->width());
|
||||||
|
};
|
||||||
|
button->setClickedCallback(showMore);
|
||||||
|
showMore();
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Info::Statistics
|
} // namespace Info::Statistics
|
||||||
|
|
|
@ -17,6 +17,10 @@ namespace Api {
|
||||||
class MessageStatistics;
|
class MessageStatistics;
|
||||||
} // namespace Api
|
} // namespace Api
|
||||||
|
|
||||||
|
namespace Data {
|
||||||
|
struct SupergroupStatistics;
|
||||||
|
} // namespace Data
|
||||||
|
|
||||||
namespace Info::Statistics {
|
namespace Info::Statistics {
|
||||||
|
|
||||||
void AddPublicForwards(
|
void AddPublicForwards(
|
||||||
|
@ -26,4 +30,11 @@ void AddPublicForwards(
|
||||||
not_null<PeerData*> peer,
|
not_null<PeerData*> peer,
|
||||||
FullMsgId contextId);
|
FullMsgId contextId);
|
||||||
|
|
||||||
|
void AddMembersList(
|
||||||
|
Data::SupergroupStatistics data,
|
||||||
|
not_null<Ui::VerticalLayout*> container,
|
||||||
|
Fn<void(not_null<PeerData*>)> showPeerInfo,
|
||||||
|
not_null<PeerData*> peer,
|
||||||
|
rpl::producer<QString> title);
|
||||||
|
|
||||||
} // namespace Info::Statistics
|
} // namespace Info::Statistics
|
||||||
|
|
|
@ -609,12 +609,54 @@ Widget::Widget(
|
||||||
|
|
||||||
FillOverview(inner, anyStats);
|
FillOverview(inner, anyStats);
|
||||||
FillStatistic(inner, descriptor, anyStats);
|
FillStatistic(inner, descriptor, anyStats);
|
||||||
if (const auto channel = anyStats.channel) {
|
const auto &channel = anyStats.channel;
|
||||||
|
const auto &supergroup = anyStats.supergroup;
|
||||||
|
if (channel) {
|
||||||
const auto showSection = [controller](
|
const auto showSection = [controller](
|
||||||
std::shared_ptr<Window::SectionMemento> memento) {
|
std::shared_ptr<Window::SectionMemento> memento) {
|
||||||
controller->showSection(std::move(memento));
|
controller->showSection(std::move(memento));
|
||||||
};
|
};
|
||||||
FillRecentPosts(inner, descriptor, channel, showSection);
|
FillRecentPosts(inner, descriptor, channel, showSection);
|
||||||
|
} else if (supergroup) {
|
||||||
|
const auto showPeerInfo = [controller](
|
||||||
|
not_null<PeerData*> peer) {
|
||||||
|
controller->showSection(
|
||||||
|
std::make_shared<Info::Memento>(peer));
|
||||||
|
};
|
||||||
|
const auto addSkip = [&](
|
||||||
|
not_null<Ui::VerticalLayout*> c) {
|
||||||
|
::Settings::AddSkip(c);
|
||||||
|
::Settings::AddDivider(c);
|
||||||
|
::Settings::AddSkip(c);
|
||||||
|
::Settings::AddSkip(c);
|
||||||
|
};
|
||||||
|
if (!supergroup.topSenders.empty()) {
|
||||||
|
AddMembersList(
|
||||||
|
{ .topSenders = supergroup.topSenders },
|
||||||
|
inner,
|
||||||
|
showPeerInfo,
|
||||||
|
descriptor.peer,
|
||||||
|
tr::lng_stats_members_title());
|
||||||
|
}
|
||||||
|
if (!supergroup.topAdministrators.empty()) {
|
||||||
|
addSkip(inner);
|
||||||
|
AddMembersList(
|
||||||
|
{ .topAdministrators
|
||||||
|
= supergroup.topAdministrators },
|
||||||
|
inner,
|
||||||
|
showPeerInfo,
|
||||||
|
descriptor.peer,
|
||||||
|
tr::lng_stats_admins_title());
|
||||||
|
}
|
||||||
|
if (!supergroup.topInviters.empty()) {
|
||||||
|
addSkip(inner);
|
||||||
|
AddMembersList(
|
||||||
|
{ .topInviters = supergroup.topInviters },
|
||||||
|
inner,
|
||||||
|
showPeerInfo,
|
||||||
|
descriptor.peer,
|
||||||
|
tr::lng_stats_inviters_title());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
finishLoading();
|
finishLoading();
|
||||||
}, inner->lifetime());
|
}, inner->lifetime());
|
||||||
|
|
Loading…
Add table
Reference in a new issue