Added ability to remove recent stickers.

Telegram/Resources/langs/lang.strings

@@ -1219,6 +1219,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recent_stickers" = "Frequently used";
 "lng_faved_stickers_add" = "Add to Favorites";
 "lng_faved_stickers_remove" = "Remove from Favorites";
+"lng_recent_stickers_remove" = "Remove from Recent";
 "lng_group_stickers" = "Group stickers";
 "lng_group_stickers_description" = "You can choose a sticker set which will be available for every member while in the group chat.";
 "lng_group_stickers_add" = "Choose sticker set";

Telegram/SourceFiles/api/api_toggling_media.cpp

@@ -11,25 +11,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
 #include "data/data_session.h"
-#include "data/stickers/data_stickers.h" // Stickers::addSavedGif
+#include "data/stickers/data_stickers.h"
 #include "main/main_session.h"
 
 namespace Api {
 namespace {
 
-template <typename MTPToggleRequest, typename DoneCallback>
+template <typename ToggleRequest, typename DoneCallback>
 void ToggleExistingMedia(
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin,
-		bool saved,
+		ToggleRequest toggleRequest,
 		DoneCallback &&done) {
 	const auto api = &document->owner().session().api();
 
 	auto performRequest = [=](const auto &repeatRequest) -> void {
 		const auto usedFileReference = document->fileReference();
-		api->request(MTPToggleRequest(
+		api->request(std::move(
-			document->mtpInput(),
+			toggleRequest
-			MTP_bool(!saved)
 		)).done([=](const MTPBool &result) {
 			if (mtpIsTrue(result)) {
 				done();
@@ -67,13 +66,35 @@ void ToggleFavedSticker(
 	if (faved && !document->sticker()) {
 		return;
 	}
-	ToggleExistingMedia<MTPmessages_FaveSticker>(
+	ToggleExistingMedia(
 		document,
 		std::move(origin),
-		faved,
+		MTPmessages_FaveSticker(document->mtpInput(), MTP_bool(!faved)),
 		[=] { document->owner().stickers().setFaved(document, faved); });
 }
 
+void ToggleRecentSticker(
+		not_null<DocumentData*> document,
+		Data::FileOrigin origin,
+		bool saved) {
+	if (!document->sticker()) {
+		return;
+	}
+	auto done = [=] {
+		if (!saved) {
+			document->owner().stickers().removeFromRecentSet(document);
+		}
+	};
+	ToggleExistingMedia(
+		document,
+		std::move(origin),
+		MTPmessages_SaveRecentSticker(
+			MTP_flags(MTPmessages_SaveRecentSticker::Flag(0)),
+			document->mtpInput(),
+			MTP_bool(!saved)),
+		std::move(done));
+}
+
 void ToggleSavedGif(
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin,
@@ -86,10 +107,10 @@ void ToggleSavedGif(
 			document->owner().stickers().addSavedGif(document);
 		}
 	};
-	ToggleExistingMedia<MTPmessages_SaveGif>(
+	ToggleExistingMedia(
 		document,
 		std::move(origin),
-		saved,
+		MTPmessages_SaveGif(document->mtpInput(), MTP_bool(!saved)),
 		std::move(done));
 }
 

Telegram/SourceFiles/api/api_toggling_media.h

@@ -18,6 +18,11 @@ void ToggleFavedSticker(
 	Data::FileOrigin origin,
 	bool faved);
 
+void ToggleRecentSticker(
+	not_null<DocumentData*> document,
+	Data::FileOrigin origin,
+	bool saved);
+
 void ToggleSavedGif(
 	not_null<DocumentData*> document,
 	Data::FileOrigin origin,

Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp

@@ -2093,6 +2093,15 @@ void StickersListWidget::fillContextMenu(
 		menu->addAction(tr::lng_context_pack_info(tr::now), [=] {
 			showStickerSetBox(document);
 		});
+
+		if (const auto id = set.id; id == Data::Stickers::RecentSetId) {
+			menu->addAction(tr::lng_recent_stickers_remove(tr::now), [=] {
+				Api::ToggleRecentSticker(
+					document,
+					Data::FileOriginStickerSet(id, 0),
+					false);
+			});
+		}
 	}
 }
 

Telegram/SourceFiles/data/stickers/data_stickers.cpp

@@ -29,6 +29,43 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Data {
 
+namespace {
+
+void RemoveFromSet(
+		StickersSets &sets,
+		not_null<DocumentData*> document,
+		uint64 setId) {
+	const auto it = sets.find(setId);
+	if (it == sets.end()) {
+		return;
+	}
+	const auto set = it->second.get();
+	const auto index = set->stickers.indexOf(document);
+	if (index < 0) {
+		return;
+	}
+	set->stickers.removeAt(index);
+	if (!set->dates.empty()) {
+		set->dates.erase(set->dates.begin() + index);
+	}
+	for (auto i = set->emoji.begin(); i != set->emoji.end();) {
+		const auto index = i->indexOf(document);
+		if (index >= 0) {
+			i->removeAt(index);
+			if (i->empty()) {
+				i = set->emoji.erase(i);
+				continue;
+			}
+		}
+		++i;
+	}
+	if (set->stickers.empty()) {
+		sets.erase(it);
+	}
+}
+
+} // namespace
+
 Stickers::Stickers(not_null<Session*> owner) : _owner(owner) {
 }
 
@@ -513,32 +550,14 @@ void Stickers::requestSetToPushFaved(not_null<DocumentData*> document) {
 	}).send();
 }
 
+void Stickers::removeFromRecentSet(not_null<DocumentData*> document) {
+	RemoveFromSet(setsRef(), document, CloudRecentSetId);
+	session().local().writeRecentStickers();
+	notifyRecentUpdated();
+}
+
 void Stickers::setIsNotFaved(not_null<DocumentData*> document) {
-	auto &sets = setsRef();
+	RemoveFromSet(setsRef(), document, FavedSetId);
-	auto it = sets.find(FavedSetId);
-	if (it == sets.end()) {
-		return;
-	}
-	const auto set = it->second.get();
-	auto index = set->stickers.indexOf(document);
-	if (index < 0) {
-		return;
-	}
-	set->stickers.removeAt(index);
-	for (auto i = set->emoji.begin(); i != set->emoji.end();) {
-		auto index = i->indexOf(document);
-		if (index >= 0) {
-			i->removeAt(index);
-			if (i->empty()) {
-				i = set->emoji.erase(i);
-				continue;
-			}
-		}
-		++i;
-	}
-	if (set->stickers.empty()) {
-		sets.erase(it);
-	}
 	session().local().writeFavedStickers();
 	notifyUpdated();
 }

Telegram/SourceFiles/data/stickers/data_stickers.h

@@ -129,6 +129,7 @@ public:
 	SavedGifs &savedGifsRef() {
 		return _savedGifs;
 	}
+	void removeFromRecentSet(not_null<DocumentData*> document);
 
 	void addSavedGif(not_null<DocumentData*> document);
 	void checkSavedGif(not_null<HistoryItem*> item);