chore: refactor

Telegram/Resources/langs/lang.strings

@@ -1625,7 +1625,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_delete_contact" = "Delete contact";
 "lng_info_share_contact" = "Share this contact";
 "lng_profile_clear_history" = "Clear history";
-"lng_profile_delete_my_messages" = "Delete all my messages";
 "lng_profile_delete_conversation" = "Delete chat";
 "lng_profile_block_user" = "Block user";
 "lng_profile_unblock_user" = "Unblock user";
@@ -2012,7 +2011,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sure_leave_group" = "Are you sure you want to leave this group?";
 "lng_sure_delete_group" = "Are you sure you want to delete this group? All members will be removed, and all messages will be lost.";
 "lng_sure_delete_saved_messages" = "Are you sure you want to delete all your saved messages?\n\nThis action cannot be undone.";
-"lng_sure_delete_my_messages" = "Are you sure you want to delete all your messages from this group?";
 "lng_no_clear_history_channel" = "In channels you can enable auto-delete for messages.";
 "lng_no_clear_history_group" = "In public groups you can enable auto-delete for messages.";
 "lng_sure_delete_by_date_one" = "Are you sure you want to delete all messages for **{date}**?\n\nThis action cannot be undone.";
@@ -6837,6 +6835,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "ayu_ClearDeletedMessagesTitle" = "Clear deleted messages";
 "ayu_ClearDeletedMessagesText" = "Are you sure you want to clear all deleted messages in this chat?";
 "ayu_ClearDeletedMessagesActionText" = "Clear";
+"ayu_DeleteOwnMessages" = "Delete own messages";
+"ayu_DeleteOwnMessagesConfirmation" = "Are you sure you want to delete all your messages from this group?";
 "ayu_SuggestGhostModeTitle" = "Ghost Mode";
 "ayu_SuggestGhostModeStoryText" = "Do you want to enable **Ghost Mode** before viewing the story?";
 "ayu_SuggestGhostModeStoryActionTextYes" = "Yes";

Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp

@@ -20,25 +20,168 @@
 #include "core/mime_type.h"
 #include "styles/style_ayu_icons.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_layers.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "window/window_peer_menu.h"
 
 #include "ayu/ui/message_history/history_section.h"
 #include "ayu/utils/telegram_helpers.h"
+#include "base/call_delayed.h"
+#include "base/random.h"
 #include "base/unixtime.h"
 #include "data/data_channel.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
 #include "data/data_forum_topic.h"
+#include "data/data_search_controller.h"
 #include "data/data_session.h"
 #include "history/view/history_view_context_menu.h"
 #include "history/view/history_view_element.h"
+#include "ui/boxes/confirm_box.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 
 namespace AyuUi {
 
+namespace {
+
+void DeleteMyMessagesAfterConfirm(not_null<PeerData*> peer) {
+	const auto session = &peer->session();
+
+	auto collected = std::make_shared<std::vector<MsgId>>();
+
+	const auto removeNext = std::make_shared<Fn<void(int)>>();
+	const auto requestNext = std::make_shared<Fn<void(MsgId)>>();
+
+	*removeNext = [=](int index)
+	{
+		if (index >= int(collected->size())) {
+			DEBUG_LOG(("Deleted all %1 my messages in this chat").arg(collected->size()));
+			return;
+		}
+
+		QVector<MTPint> ids;
+		ids.reserve(std::min<int>(100, collected->size() - index));
+		for (auto i = 0; i < 100 && (index + i) < int(collected->size()); ++i) {
+			ids.push_back(MTP_int((*collected)[index + i].bare));
+		}
+
+		const auto batch = index / 100 + 1;
+		const auto done = [=](const MTPmessages_AffectedMessages &result)
+		{
+			session->api().applyAffectedMessages(peer, result);
+			if (peer->isChannel()) {
+				session->data().processMessagesDeleted(peer->id, ids);
+			} else {
+				session->data().processNonChannelMessagesDeleted(ids);
+			}
+			const auto deleted = index + ids.size();
+			DEBUG_LOG(("Deleted batch %1, total deleted %2/%3").arg(batch).arg(deleted).arg(collected->size()));
+			const auto delay = crl::time(500 + base::RandomValue<int>() % 500);
+			base::call_delayed(delay, [=] { (*removeNext)(deleted); });
+		};
+		const auto fail = [=](const MTP::Error &error)
+		{
+			DEBUG_LOG(("Delete batch failed: %1").arg(error.type()));
+			const auto delay = crl::time(1000);
+			base::call_delayed(delay, [=] { (*removeNext)(index); });
+		};
+
+		if (const auto channel = peer->asChannel()) {
+			session->api()
+				.request(MTPchannels_DeleteMessages(channel->inputChannel, MTP_vector<MTPint>(ids)))
+				.done(done)
+				.fail(fail)
+				.handleFloodErrors()
+				.send();
+		} else {
+			using Flag = MTPmessages_DeleteMessages::Flag;
+			session->api()
+				.request(MTPmessages_DeleteMessages(MTP_flags(Flag::f_revoke), MTP_vector<MTPint>(ids)))
+				.done(done)
+				.fail(fail)
+				.handleFloodErrors()
+				.send();
+		}
+	};
+
+	*requestNext = [=](MsgId from)
+	{
+		using Flag = MTPmessages_Search::Flag;
+		auto request = MTPmessages_Search(
+			MTP_flags(Flag::f_from_id),
+			peer->input,
+			MTP_string(),
+			MTP_inputPeerSelf(),
+			MTPInputPeer(),
+			MTPVector<MTPReaction>(),
+			MTP_int(0),
+			// top_msg_id
+			MTP_inputMessagesFilterEmpty(),
+			MTP_int(0),
+			// min_date
+			MTP_int(0),
+			// max_date
+			MTP_int(from.bare),
+			MTP_int(0),
+			// add_offset
+			MTP_int(100),
+			MTP_int(0),
+			// max_id
+			MTP_int(0),
+			// min_id
+			MTP_long(0)); // hash
+
+		session->api()
+			.request(std::move(request))
+			.done([=](const Api::HistoryRequestResult &result)
+			{
+				auto parsed = Api::ParseHistoryResult(peer, from, Data::LoadDirection::Before, result);
+				MsgId minId;
+				int batchCount = 0;
+				for (const auto &id : parsed.messageIds) {
+					if (!minId || id < minId) minId = id;
+					collected->push_back(id);
+					++batchCount;
+				}
+				DEBUG_LOG(("Batch found %1 my messages, total %2").arg(batchCount).arg(collected->size()));
+				if (parsed.messageIds.size() == 100 && minId) {
+					(*requestNext)(minId - MsgId(1));
+				} else {
+					DEBUG_LOG(("Found %1 my messages in this chat (SEARCH)").arg(collected->size()));
+					(*removeNext)(0);
+				}
+			})
+			.fail([=](const MTP::Error &error) { DEBUG_LOG(("History fetch failed: %1").arg(error.type())); })
+			.send();
+	};
+
+	(*requestNext)(MsgId(0));
+}
+
+Fn<void()> DeleteMyMessagesHandler(not_null<Window::SessionController*> controller, not_null<PeerData*> peer) {
+	return [=]
+	{
+		if (!controller->showFrozenError()) {
+			controller->show(Ui::MakeConfirmBox({
+				.text = tr::ayu_DeleteOwnMessagesConfirmation(tr::now),
+				.confirmed =
+				[=](Fn<void()> &&close)
+				{
+					DeleteMyMessagesAfterConfirm(peer);
+					close();
+				},
+				.confirmText = tr::lng_box_delete(),
+				.cancelText = tr::lng_cancel(),
+				.confirmStyle = &st::attentionBoxButton,
+			}));
+		}
+	};
+}
+
+}
+
 bool needToShowItem(int state) {
 	return state == 1 || (state == 2 && base::IsExtendedContextMenuModifierPressed());
 }
@@ -170,6 +313,34 @@ void AddOpenChannelAction(PeerData *peerData,
 		&st::menuIconChannel);
 }
 
+void AddDeleteOwnMessagesAction(PeerData *peerData,
+								Data::ForumTopic *topic,
+								not_null<Window::SessionController*> sessionController,
+								const Window::PeerMenuCallback &addCallback) {
+	if (topic) {
+		return;
+	}
+	const auto isGroup = peerData->isChat() || peerData->isMegagroup();
+	if (!isGroup) {
+		return;
+	}
+	if (const auto chat = peerData->asChat()) {
+		if (!chat->amIn() || chat->amCreator() || chat->hasAdminRights()) {
+			return;
+		}
+	} else if (const auto channel = peerData->asChannel()) {
+		if (!channel->isMegagroup() || !channel->amIn() || channel->amCreator() || channel->hasAdminRights()) {
+			return;
+		}
+	} else {
+		return;
+	}
+	addCallback(
+		tr::ayu_DeleteOwnMessages(tr::now),
+		DeleteMyMessagesHandler(sessionController, peerData),
+		&st::menuIconTTL);
+}
+
 void AddHistoryAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
 	if (item->hideEditedBadge()) {
 		return;

Telegram/SourceFiles/ayu/ui/context_menu/context_menu.h

@@ -28,6 +28,10 @@ void AddJumpToBeginningAction(PeerData *peerData,
 void AddOpenChannelAction(PeerData *peerData,
 							  not_null<Window::SessionController*> sessionController,
 							  const Window::PeerMenuCallback &addCallback);
+void AddDeleteOwnMessagesAction(PeerData *peerData,
+								Data::ForumTopic* topic,
+								not_null<Window::SessionController*> sessionController,
+								const Window::PeerMenuCallback &addCallback);
 
 void AddHistoryAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item);
 void AddHideMessageAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item);

Telegram/SourceFiles/window/window_peer_menu.cpp

@@ -32,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/pin_messages_box.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/report_messages_box.h"
-#include "data/data_search_controller.h"
 #include "boxes/peers/add_bot_to_chat_box.h"
 #include "boxes/peers/add_participants_box.h"
 #include "boxes/peers/edit_forum_topic_box.h"
@@ -288,7 +287,6 @@ private:
 	void addToggleUnreadMark();
 	void addToggleArchive();
 	void addClearHistory();
-	void addDeleteMyMessages();
 	void addDeleteChat();
 	void addLeaveChat();
 	void addJoinChat();
@@ -747,31 +745,6 @@ void Filler::addClearHistory() {
 		&st::menuIconClear);
 }
 
-void Filler::addDeleteMyMessages() {
-	   if (_topic) {
-			   return;
-	   }
-	   const auto isGroup = _peer->isChat() || _peer->isMegagroup();
-	   if (!isGroup) {
-			   return;
-	   }
-	   if (const auto chat = _peer->asChat()) {
-			   if (!chat->amIn() || chat->amCreator() || chat->hasAdminRights()) {
-					   return;
-			   }
-	   } else if (const auto channel = _peer->asChannel()) {
-			   if (!channel->isMegagroup() || !channel->amIn() || channel->amCreator() || channel->hasAdminRights()) {
-					   return;
-			   }
-	   } else {
-			   return;
-	   }
-	   _addAction(
-			   tr::lng_profile_delete_my_messages(tr::now),
-			   DeleteMyMessagesHandler(_controller, _peer),
-			   &st::menuIconDelete);
-}
-
 void Filler::addDeleteChat() {
 	if (_topic || _peer->isChannel()) {
 		return;
@@ -1452,7 +1425,7 @@ void Filler::fillContextMenuActions() {
 		}
 	}
 	addClearHistory();
-	addDeleteMyMessages();
+	AyuUi::AddDeleteOwnMessagesAction(_peer, _topic, _controller, _addAction);
 	addDeleteChat();
 	addLeaveChat();
 	addDeleteTopic();
@@ -1476,7 +1449,7 @@ void Filler::fillHistoryActions() {
 	addReport();
 	AyuUi::AddDeletedMessagesActions(_peer, _thread, _controller, _addAction);
 	addClearHistory();
-	addDeleteMyMessages();
+	AyuUi::AddDeleteOwnMessagesAction(_peer, _topic, _controller, _addAction);
 	addDeleteChat();
 	addLeaveChat();
 }
@@ -3208,128 +3181,6 @@ Fn<void()> ClearHistoryHandler(
 	};
 }
 
-void DeleteMyMessagesAfterConfirm(not_null<PeerData*> peer) {
-	   const auto session = &peer->session();
-
-	   auto collected = std::make_shared<std::vector<MsgId>>();
-
-	   const auto removeNext = std::make_shared<Fn<void(int)>>();
-	   const auto requestNext = std::make_shared<Fn<void(MsgId)>>();
-
-	   *removeNext = [=](int index) {
-			   if (index >= int(collected->size())) {
-					   DEBUG_LOG(("Deleted all %1 my messages in this chat").arg(collected->size()));
-					   return;
-			   }
-
-			   QVector<MTPint> ids;
-			   ids.reserve(std::min<int>(100, collected->size() - index));
-			   for (auto i = 0; i < 100 && (index + i) < int(collected->size()); ++i) {
-					   ids.push_back(MTP_int((*collected)[index + i].bare));
-			   }
-
-			   const auto batch = index / 100 + 1;
-			   const auto done = [=](const MTPmessages_AffectedMessages &result) {
-					   session->api().applyAffectedMessages(peer, result);
-				   if (peer->isChannel()) {
-					   session->data().processMessagesDeleted(peer->id, ids);
-				   } else {
-					   session->data().processNonChannelMessagesDeleted(ids);
-				   }
-					   const auto deleted = index + ids.size();
-					   DEBUG_LOG(("Deleted batch %1, total deleted %2/%3").arg(batch).arg(deleted).arg(collected->size()));
-					   const auto delay = crl::time(500 + base::RandomValue<int>() % 500);
-					   base::call_delayed(delay, [=] { (*removeNext)(deleted); });
-			   };
-			   const auto fail = [=](const MTP::Error &error) {
-					   DEBUG_LOG(("Delete batch failed: %1").arg(error.type()));
-					   const auto delay = crl::time(1000);
-					   base::call_delayed(delay, [=] { (*removeNext)(index); });
-			   };
-
-			   if (const auto channel = peer->asChannel()) {
-					   session->api()
-							   .request(MTPchannels_DeleteMessages(channel->inputChannel, MTP_vector<MTPint>(ids)))
-							   .done(done)
-							   .fail(fail)
-							   .handleFloodErrors()
-							   .send();
-			   } else {
-					   using Flag = MTPmessages_DeleteMessages::Flag;
-					   session->api()
-							   .request(MTPmessages_DeleteMessages(MTP_flags(Flag::f_revoke), MTP_vector<MTPint>(ids)))
-							   .done(done)
-							   .fail(fail)
-							   .handleFloodErrors()
-							   .send();
-			   }
-	   };
-
-	   *requestNext = [=](MsgId from) {
-			   using Flag = MTPmessages_Search::Flag;
-			   auto request = MTPmessages_Search(
-					   MTP_flags(Flag::f_from_id),
-					   peer->input,
-					   MTP_string(),
-					   MTP_inputPeerSelf(),
-					   MTPInputPeer(),
-					   MTPVector<MTPReaction>(),
-					   MTP_int(0), // top_msg_id
-					   MTP_inputMessagesFilterEmpty(),
-					   MTP_int(0), // min_date
-					   MTP_int(0), // max_date
-					   MTP_int(from.bare),
-					   MTP_int(0), // add_offset
-					   MTP_int(100),
-					   MTP_int(0), // max_id
-					   MTP_int(0), // min_id
-					   MTP_long(0)); // hash
-
-			   session->api()
-					   .request(std::move(request))
-					   .done([=](const Api::HistoryRequestResult &result) {
-							   auto parsed = Api::ParseHistoryResult(peer, from, Data::LoadDirection::Before, result);
-							   MsgId minId;
-							   int batchCount = 0;
-							   for (const auto &id : parsed.messageIds) {
-									   if (!minId || id < minId) minId = id;
-									   collected->push_back(id);
-									   ++batchCount;
-							   }
-							   DEBUG_LOG(("Batch found %1 my messages, total %2").arg(batchCount).arg(collected->size()));
-							   if (parsed.messageIds.size() == 100 && minId) {
-									   (*requestNext)(minId - MsgId(1));
-							   } else {
-									   DEBUG_LOG(("Found %1 my messages in this chat (SEARCH)").arg(collected->size()));
-									   (*removeNext)(0);
-							   }
-					   })
-					   .fail([=](const MTP::Error &error) { DEBUG_LOG(("History fetch failed: %1").arg(error.type())); })
-					   .send();
-	   };
-
-	   (*requestNext)(MsgId(0));
-}
-
-Fn<void()> DeleteMyMessagesHandler(not_null<Window::SessionController *> controller, not_null<PeerData *> peer) {
-	return [=]
-	{
-		if (!controller->showFrozenError()) {
-			controller->show(Ui::MakeConfirmBox({
-				.text = tr::lng_sure_delete_my_messages(tr::now),
-				.confirmed =
-					[=](Fn<void()> &&close)
-				{
-					DeleteMyMessagesAfterConfirm(peer);
-					close();
-				},
-				.confirmText = tr::lng_box_delete(),
-				.cancelText = tr::lng_cancel(),
-				.confirmStyle = &st::attentionBoxButton,
-			}));
-		}
-	};
-}
 Fn<void()> DeleteAndLeaveHandler(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {

Telegram/SourceFiles/window/window_peer_menu.h

@@ -147,9 +147,6 @@ Fn<void()> DeleteAndLeaveHandler(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
 
-Fn<void()> DeleteMyMessagesHandler(
-	not_null<Window::SessionController*> controller,
-	not_null<PeerData*> peer);
 object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 	not_null<Main::Session*> session,
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,