From af93d7cc9719e60b36261af9311a3e2dcfef9647 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Nov 2021 22:44:28 +0400
Subject: [PATCH] History::createItem returns not_null.

---
 Telegram/SourceFiles/data/data_session.cpp |  2 +-
 Telegram/SourceFiles/history/history.cpp   | 14 ++++----------
 Telegram/SourceFiles/history/history.h     |  4 ++--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index aa9defaf5..e52adafdc 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -2213,7 +2213,7 @@ HistoryItem *Session::addNewMessage(
 		data,
 		localFlags,
 		type);
-	if (result && type == NewMessageType::Unread) {
+	if (type == NewMessageType::Unread) {
 		CheckForSwitchInlineButton(result);
 	}
 	return result;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index dc5c2239c..26529e096 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -360,7 +360,7 @@ void History::setForwardDraft(Data::ForwardDraft &&draft) {
 	_forwardDraft = std::move(draft);
 }
 
-HistoryItem *History::createItem(
+not_null<HistoryItem*> History::createItem(
 		MsgId id,
 		const MTPMessage &message,
 		MessageFlags localFlags,
@@ -382,28 +382,22 @@ std::vector<not_null<HistoryItem*>> History::createItems(
 	const auto detachExistingItem = true;
 	for (auto i = data.cend(), e = data.cbegin(); i != e;) {
 		const auto &data = *--i;
-		const auto item = createItem(
+		result.emplace_back(createItem(
 			IdFromMessage(data),
 			data,
 			localFlags,
-			detachExistingItem);
-		if (item) {
-			result.emplace_back(item);
-		}
+			detachExistingItem));
 	}
 	return result;
 }
 
-HistoryItem *History::addNewMessage(
+not_null<HistoryItem*> History::addNewMessage(
 		MsgId id,
 		const MTPMessage &msg,
 		MessageFlags localFlags,
 		NewMessageType type) {
 	const auto detachExistingItem = (type == NewMessageType::Unread);
 	const auto item = createItem(id, msg, localFlags, detachExistingItem);
-	if (!item) {
-		return nullptr;
-	}
 	if (type == NewMessageType::Existing || item->mainView()) {
 		return item;
 	}
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 588d5cdd9..0c8fda48c 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -135,7 +135,7 @@ public:
 
 	void unpinAllMessages();
 
-	HistoryItem *addNewMessage(
+	not_null<HistoryItem*> addNewMessage(
 		MsgId id,
 		const MTPMessage &msg,
 		MessageFlags localFlags,
@@ -193,7 +193,7 @@ public:
 		HistoryMessageMarkupData &&markup);
 
 	// Used only internally and for channel admin log.
-	HistoryItem *createItem(
+	not_null<HistoryItem*> createItem(
 		MsgId id,
 		const MTPMessage &message,
 		MessageFlags localFlags,