From 3c12982c6099bb782ffa1738894465b7ab8d58e1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 23 Nov 2023 20:36:27 +0300
Subject: =?UTF-8?q?fixes=20#3953=20(Telegram:=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=BA=D0=B5=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=BA=D0=B0=D0=BD=D0=B0=D0=BB=20=D0=B2=20=D0=9C=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=83=20=D0=B7=D0=B0=D0=B2=D0=BE=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=20=D0=B1=D0=BE=D1=82=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/Telegram/src/proto.h    |  2 ++
 protocols/Telegram/src/server.cpp | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

(limited to 'protocols')

diff --git a/protocols/Telegram/src/proto.h b/protocols/Telegram/src/proto.h
index c8a48d844e..b0c68e3834 100644
--- a/protocols/Telegram/src/proto.h
+++ b/protocols/Telegram/src/proto.h
@@ -189,6 +189,8 @@ class CTelegramProto : public PROTO<CTelegramProto>
 	TD::object_ptr<TD::AuthorizationState> pAuthState;
 	TD::object_ptr<TD::ConnectionState> pConnState;
 
+	TD::array<TD::int53> m_botIds;
+
 	mir_cs m_csMarkRead;
 	TD::int53 m_markChatId = 0;
 	TD::array<TD::int53> m_markIds;
diff --git a/protocols/Telegram/src/server.cpp b/protocols/Telegram/src/server.cpp
index f0315de203..68f62b2ccc 100644
--- a/protocols/Telegram/src/server.cpp
+++ b/protocols/Telegram/src/server.cpp
@@ -24,6 +24,8 @@ void CTelegramProto::OnEndSession(td::ClientManager::Response&)
 
 void __cdecl CTelegramProto::ServerThread(void *)
 {
+	m_botIds.clear();
+
 	m_bTerminated = m_bAuthorized = false;
 	m_pClientManager = std::make_unique<td::ClientManager>();
 	m_iClientId = m_pClientManager->create_client_id();
@@ -797,6 +799,15 @@ void CTelegramProto::ProcessMessageContent(TD::updateMessageContent *pObj)
 	db_event_edit(hDbEvent, &dbei, true);
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
+static char *sttBotIds[] = {
+	"replies_bot_chat_id",
+	"group_anonymous_bot_user_id",
+	"channel_bot_user_id",
+	"anti_spam_bot_user_id",
+};
+
 void CTelegramProto::ProcessOption(TD::updateOption *pObj)
 {
 	TD::int53 iValue = 0;
@@ -826,9 +837,18 @@ void CTelegramProto::ProcessOption(TD::updateOption *pObj)
 		}
 
 		setWString(m_iSavedMessages, "Nick", TranslateT("Saved messages"));
+		return;
 	}
+
+	for (auto &it : sttBotIds)
+		if (pObj->name_ == it) {
+			m_botIds.push_back(iValue);
+			return;
+		}
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 void CTelegramProto::ProcessStatus(TD::updateUserStatus *pObj)
 {
 	if (auto *pUser = FindUser(pObj->user_id_)) {
@@ -909,6 +929,15 @@ void CTelegramProto::ProcessUser(TD::updateUser *pObj)
 		return;
 	}
 
+	for (auto &it : m_botIds)
+		if (it == pUser->id_) {
+			if (auto *pu = FindUser(it)) {
+				Contact::Hide(pu->hContact);
+				Contact::RemoveFromList(pu->hContact);
+			}
+			return;
+		}
+
 	auto *pu = AddUser(pUser->id_, false);
 	std::string szFirstName = pUser->first_name_, szLastName = pUser->last_name_;
 	if (szLastName.empty()) {
-- 
cgit v1.2.3