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

Allow report / block / delete all from channels.

This commit is contained in:
John Preston 2021-11-22 21:12:00 +04:00
parent 8d66680a96
commit 5e3b094e86
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/apiwrap.cpp
View File

@ -1757,13 +1757,13 @@ void ApiWrap::unblockParticipant(
_kickRequests.emplace(kick, requestId); _kickRequests.emplace(kick, requestId);
} }
void ApiWrap::deleteAllFromUser( void ApiWrap::deleteAllFromParticipant(
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
not_null<UserData*> from) { not_null<PeerData*> from) {
const auto history = _session->data().historyLoaded(channel); const auto history = _session->data().historyLoaded(channel);
const auto ids = history const auto ids = history
? history->collectMessagesFromUserToDelete(from) ? history->collectMessagesFromParticipantToDelete(from)
: QVector<MsgId>(); : std::vector<MsgId>();
const auto channelId = peerToChannel(channel->id); const auto channelId = peerToChannel(channel->id);
for (const auto &msgId : ids) { for (const auto &msgId : ids) {
if (const auto item = _session->data().message(channelId, msgId)) { if (const auto item = _session->data().message(channelId, msgId)) {
@ -1773,19 +1773,19 @@ void ApiWrap::deleteAllFromUser(
_session->data().sendHistoryChangeNotifications(); _session->data().sendHistoryChangeNotifications();
deleteAllFromUserSend(channel, from); deleteAllFromParticipantSend(channel, from);
} }
void ApiWrap::deleteAllFromUserSend( void ApiWrap::deleteAllFromParticipantSend(
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
not_null<UserData*> from) { not_null<PeerData*> from) {
request(MTPchannels_DeleteParticipantHistory( request(MTPchannels_DeleteParticipantHistory(
channel->inputChannel, channel->inputChannel,
from->input from->input
)).done([=](const MTPmessages_AffectedHistory &result) { )).done([=](const MTPmessages_AffectedHistory &result) {
const auto offset = applyAffectedHistory(channel, result); const auto offset = applyAffectedHistory(channel, result);
if (offset > 0) { if (offset > 0) {
deleteAllFromUserSend(channel, from); deleteAllFromParticipantSend(channel, from);
} else if (const auto history = _session->data().historyLoaded(channel)) { } else if (const auto history = _session->data().historyLoaded(channel)) {
history->requestChatListMessage(); history->requestChatListMessage();
} }

8
Telegram/SourceFiles/apiwrap.h
View File

@ -230,9 +230,9 @@ public:
void unblockParticipant( void unblockParticipant(
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
not_null<PeerData*> participant); not_null<PeerData*> participant);
void deleteAllFromUser( void deleteAllFromParticipant(
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
not_null<UserData*> from); not_null<PeerData*> from);
void requestWebPageDelayed(WebPageData *page); void requestWebPageDelayed(WebPageData *page);
void clearWebPageRequest(WebPageData *page); void clearWebPageRequest(WebPageData *page);
@ -518,9 +518,9 @@ private:
bool revoke); bool revoke);
void applyAffectedMessages(const MTPmessages_AffectedMessages &result); void applyAffectedMessages(const MTPmessages_AffectedMessages &result);
void deleteAllFromUserSend( void deleteAllFromParticipantSend(
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
not_null<UserData*> from); not_null<PeerData*> from);
void uploadAlbumMedia( void uploadAlbumMedia(
not_null<HistoryItem*> item, not_null<HistoryItem*> item,

4
Telegram/SourceFiles/boxes/delete_messages_box.cpp
View File

@ -39,7 +39,7 @@ DeleteMessagesBox::DeleteMessagesBox(
_moderateBan = item->suggestBanReport(); _moderateBan = item->suggestBanReport();
_moderateDeleteAll = item->suggestDeleteAllReport(); _moderateDeleteAll = item->suggestDeleteAllReport();
if (_moderateBan || _moderateDeleteAll) { if (_moderateBan || _moderateDeleteAll) {
_moderateFrom = item->from()->asUser(); _moderateFrom = item->from();
_moderateInChannel = item->history()->peer->asChannel(); _moderateInChannel = item->history()->peer->asChannel();
} }
} }
@ -492,7 +492,7 @@ void DeleteMessagesBox::deleteAndClear() {
).send(); ).send();
} }
if (_deleteAll && _deleteAll->checked()) { if (_deleteAll && _deleteAll->checked()) {
_moderateInChannel->session().api().deleteAllFromUser( _moderateInChannel->session().api().deleteAllFromParticipant(
_moderateInChannel, _moderateInChannel,
_moderateFrom); _moderateFrom);
} }

2
Telegram/SourceFiles/boxes/delete_messages_box.h
View File

@ -64,7 +64,7 @@ private:
const QDate _wipeHistoryFirstToDelete; const QDate _wipeHistoryFirstToDelete;
const QDate _wipeHistoryLastToDelete; const QDate _wipeHistoryLastToDelete;
const MessageIdsList _ids; const MessageIdsList _ids;
UserData *_moderateFrom = nullptr; PeerData *_moderateFrom = nullptr;
ChannelData *_moderateInChannel = nullptr; ChannelData *_moderateInChannel = nullptr;
bool _moderateBan = false; bool _moderateBan = false;
bool _moderateDeleteAll = false; bool _moderateDeleteAll = false;

8
Telegram/SourceFiles/history/history.cpp
View File

@ -3094,13 +3094,13 @@ bool History::removeOrphanMediaGroupPart() {
return false; return false;
} }
QVector<MsgId> History::collectMessagesFromUserToDelete( std::vector<MsgId> History::collectMessagesFromParticipantToDelete(
not_null<UserData*> user) const { not_null<PeerData*> participant) const {
auto result = QVector<MsgId>(); auto result = std::vector<MsgId>();
for (const auto &block : blocks) { for (const auto &block : blocks) {
for (const auto &message : block->messages) { for (const auto &message : block->messages) {
const auto item = message->data(); const auto item = message->data();
if (item->from() == user && item->canDelete()) { if (item->from() == participant && item->canDelete()) {
result.push_back(item->id); result.push_back(item->id);
} }
} }

4
Telegram/SourceFiles/history/history.h
View File

@ -101,8 +101,8 @@ public:
Element *findLastDisplayed() const; Element *findLastDisplayed() const;
bool hasOrphanMediaGroupPart() const; bool hasOrphanMediaGroupPart() const;
bool removeOrphanMediaGroupPart(); bool removeOrphanMediaGroupPart();
QVector<MsgId> collectMessagesFromUserToDelete( [[nodiscard]] std::vector<MsgId> collectMessagesFromParticipantToDelete(
not_null<UserData*> user) const; not_null<PeerData*> participant) const;
enum class ClearType { enum class ClearType {
Unload, Unload,