From c1849a9d50be0951bc4b2a5c0f14dbde5a8340e0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 30 Nov 2023 15:03:35 +0300
Subject: =?UTF-8?q?fixes=20#3985=20(Telegram:=20=D0=B8=D0=B7=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D1=83?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0?=
 =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D0=BB=D0=B8=D1=88=D1=8C=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=83=D1=81=D0=BA=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/Telegram/src/groupchat.cpp | 44 ++++++++++++++++++++++--------------
 protocols/Telegram/src/server.cpp    |  5 ++--
 2 files changed, 30 insertions(+), 19 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Telegram/src/groupchat.cpp b/protocols/Telegram/src/groupchat.cpp
index e0eec733c5..618f415922 100644
--- a/protocols/Telegram/src/groupchat.cpp
+++ b/protocols/Telegram/src/groupchat.cpp
@@ -17,6 +17,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
 
+static const wchar_t* getRoleById(uint32_t ID)
+{
+	switch (ID) {
+	case TD::chatMemberStatusCreator::ID:
+		return TranslateT("Creator");
+
+	case TD::chatMemberStatusAdministrator::ID:
+		return TranslateT("Admin");
+
+	case TD::chatMemberStatusMember::ID:
+	default:
+		return TranslateT("Participant");
+	}
+}
+
 void CTelegramProto::InitGroupChat(TG_USER *pUser, const TD::chat *pChat)
 {
 	if (pUser->m_si)
@@ -102,21 +117,6 @@ void CTelegramProto::GcAddMembers(TG_USER *pChat, const TD::array<TD::object_ptr
 {
 	for (auto &it : pMembers) {
 		auto *pMember = it.get();
-		const wchar_t *pwszRole;
-
-		switch (pMember->status_->get_id()) {
-		case TD::chatMemberStatusCreator::ID:
-			pwszRole = TranslateT("Creator");
-			break;
-		case TD::chatMemberStatusAdministrator::ID:
-			pwszRole = TranslateT("Admin");
-			break;
-		case TD::chatMemberStatusMember::ID:
-		default:
-			pwszRole = TranslateT("Participant");
-			break;
-		}
-
 		if (pMember->member_id_->get_id() != TD::messageSenderUser::ID)
 			continue;
 
@@ -130,7 +130,7 @@ void CTelegramProto::GcAddMembers(TG_USER *pChat, const TD::array<TD::object_ptr
 
 		GCEVENT gce = { pChat->m_si, GC_EVENT_JOIN };
 		gce.pszUID.w = wszUserId;
-		gce.pszStatus.w = pwszRole;
+		gce.pszStatus.w = getRoleById(pMember->status_->get_id());
 		if (bSilent)
 			gce.dwFlags = GCEF_SILENT;
 
@@ -416,5 +416,15 @@ void CTelegramProto::ProcessSuperGroup(TD::updateSupergroup *pObj)
 		pUser->wszNick = getName(pGroup->group->usernames_.get());
 		pUser->wszLastName.Format(TranslateT("%d member(s)"), pGroup->group->member_count_);
 	}
-	else AddUser(tmp.id, true);
+	else {
+		auto *pChat = AddUser(tmp.id, true);
+		if (auto *si = pChat->m_si) {
+			CMStringW wszUserId(FORMAT, L"%lld", m_iOwnId);
+
+			GCEVENT gce = { si, GC_EVENT_SETSTATUS };
+			gce.pszUID.w = wszUserId;
+			gce.pszStatus.w = getRoleById(iStatusId);
+			Chat_Event(&gce);
+		}
+	}
 }
diff --git a/protocols/Telegram/src/server.cpp b/protocols/Telegram/src/server.cpp
index acf31c7e96..d9dde02216 100644
--- a/protocols/Telegram/src/server.cpp
+++ b/protocols/Telegram/src/server.cpp
@@ -916,9 +916,10 @@ void CTelegramProto::ProcessUser(TD::updateUser *pObj)
 			auto storedId = getMStringA(pu->hContact, DBKEY_AVATAR_HASH);
 			if (remoteId != storedId.c_str()) {
 				if (!remoteId.empty()) {
-					if (pu)
+					if (pu) {
 						pu->szAvatarHash = remoteId.c_str();
-					setString(pu->hContact, DBKEY_AVATAR_HASH, remoteId.c_str());
+						setString(pu->hContact, DBKEY_AVATAR_HASH, remoteId.c_str());
+					}
 					SendQuery(new TD::downloadFile(pSmall->id_, 5, 0, 0, false));
 				}
 				else delSetting(pu->hContact, DBKEY_AVATAR_HASH);
-- 
cgit v1.2.3