From d19d86665efa3dda7a16089d4f7bf469fe833aab Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 14 Nov 2023 16:02:02 +0300
Subject: =?UTF-8?q?fixes=20#3921=20(Telegram:=20=D0=BD=D0=B5=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B8=D1=82=D1=8C=20=D1=84=D0=B5=D0=B9=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D1=8B?=
 =?UTF-8?q?)?=
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 | 21 +++++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Telegram/src/proto.h b/protocols/Telegram/src/proto.h
index 225e7b7622..c8a48d844e 100644
--- a/protocols/Telegram/src/proto.h
+++ b/protocols/Telegram/src/proto.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define STATUS_SWITCH_TIMEOUT 600
-
 #define DBKEY_ID "id"
 #define DBKEY_COMPAT "Compatibility"
 #define DBKEY_AUTHORIZED "Authorized"
diff --git a/protocols/Telegram/src/server.cpp b/protocols/Telegram/src/server.cpp
index 3aad877837..751fd69a94 100644
--- a/protocols/Telegram/src/server.cpp
+++ b/protocols/Telegram/src/server.cpp
@@ -106,14 +106,20 @@ void CTelegramProto::OnLoggedIn()
 void CTelegramProto::SendKeepAlive()
 {
 	time_t now = time(0);
+	int iDiff1 = m_iTimeDiff1, iDiff2 = m_iTimeDiff2;
 
 	for (auto &it : m_arUsers) {
-		if (it->m_timer1 && now - it->m_timer1 > STATUS_SWITCH_TIMEOUT) {
+		if (it->m_timer1 && now - it->m_timer1 > iDiff1) {
 			it->m_timer1 = 0;
-			it->m_timer2 = now;
-			setWord(it->hContact, "Status", ID_STATUS_NA);
+
+			// if the second status is set in the options, enable the second timer
+			if (m_iTimeDiff2) {
+				it->m_timer2 = now;
+				setWord(it->hContact, "Status", m_iStatus2);
+			}
+			else setWord(it->hContact, "Status", ID_STATUS_OFFLINE);
 		}
-		else if (it->m_timer2 && now - it->m_timer2 > STATUS_SWITCH_TIMEOUT) {
+		else if (it->m_timer2 && now - it->m_timer2 > iDiff2) {
 			it->m_timer2 = 0;
 			setWord(it->hContact, "Status", ID_STATUS_OFFLINE);
 		}
@@ -832,8 +838,11 @@ void CTelegramProto::ProcessStatus(TD::updateUserStatus *pObj)
 
 		case TD::userStatusRecently::ID:
 		case TD::userStatusOffline::ID:
-			setWord(pUser->hContact, "Status", ID_STATUS_AWAY);
-			pUser->m_timer1 = time(0);
+			if (m_iTimeDiff1) {
+				setWord(pUser->hContact, "Status", m_iStatus1);
+				pUser->m_timer1 = time(0);
+			}
+			else setWord(pUser->hContact, "Status", ID_STATUS_OFFLINE);
 			break;
 
 		default:
-- 
cgit v1.2.3