From 700e10d32c118f1cc1d0a6ee00744a4b48143237 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 6 Mar 2025 13:17:05 +0000
Subject: [PATCH] Use flat_map::remove in clearFrom{Topic,Item}

Now that notification closing happens in destructor, the iterator is no more needed
---
 .../linux/notifications_manager_linux.cpp     | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 6881694d9..b41d0e4a9 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -789,35 +789,24 @@ void Manager::Private::clearAll() {
 }
 
 void Manager::Private::clearFromItem(not_null<HistoryItem*> item) {
-	const auto key = ContextId{
+	const auto i = _notifications.find(ContextId{
 		.sessionId = item->history()->session().uniqueId(),
 		.peerId = item->history()->peer->id,
 		.topicRootId = item->topicRootId(),
-	};
-	const auto i = _notifications.find(key);
-	if (i == _notifications.cend()) {
-		return;
-	}
-	const auto j = i->second.find(item->id);
-	if (j == i->second.end()) {
-		return;
-	}
-	i->second.erase(j);
-	if (i->second.empty()) {
+	});
+	if (i != _notifications.cend()
+			&& i->second.remove(item->id)
+			&& i->second.empty()) {
 		_notifications.erase(i);
 	}
 }
 
 void Manager::Private::clearFromTopic(not_null<Data::ForumTopic*> topic) {
-	const auto key = ContextId{
+	_notifications.remove(ContextId{
 		.sessionId = topic->session().uniqueId(),
 		.peerId = topic->history()->peer->id,
 		.topicRootId = topic->rootId(),
-	};
-	const auto i = _notifications.find(key);
-	if (i != _notifications.cend()) {
-		_notifications.erase(i);
-	}
+	});
 }
 
 void Manager::Private::clearFromHistory(not_null<History*> history) {
@@ -846,10 +835,10 @@ void Manager::Private::clearFromSession(not_null<Main::Session*> session) {
 
 void Manager::Private::clearNotification(NotificationId id) {
 	auto i = _notifications.find(id.contextId);
-	if (i != _notifications.cend()) {
-		if (i->second.remove(id.msgId) && i->second.empty()) {
-			_notifications.erase(i);
-		}
+	if (i != _notifications.cend()
+			&& i->second.remove(id.msgId)
+			&& i->second.empty()) {
+		_notifications.erase(i);
 	}
 }