Group chats: all old APIs with lookup by module+session removed

3 files changed, 18 insertions, 23 deletions

diff --git a/protocols/WhatsApp/src/appsync.cpp b/protocols/WhatsApp/src/appsync.cpp
index 9607045131..3d812be370 100644
--- a/protocols/WhatsApp/src/appsync.cpp
+++ b/protocols/WhatsApp/src/appsync.cpp
@@ -115,7 +115,7 @@ void WhatsAppProto::OnIqServerSync(const WANode &node)
 			if (dwVersion > pCollection->version) {

 				pCollection->hash.init();

 				debugLogA("%s: applying snapshot of version %d", pCollection->szName.get(), dwVersion);

-				for (int i=0; i < snapshot->n_records; i++)

+				for (unsigned i = 0; i < snapshot->n_records; i++)

 					ParsePatch(pCollection, snapshot->records[i], true);

 			}

 			else debugLogA("%s: skipping snapshot of version %d", pCollection->szName.get(), dwVersion);

@@ -132,7 +132,7 @@ void WhatsAppProto::OnIqServerSync(const WANode &node)
 				dwVersion = patch->version->version;

 				if (dwVersion > pCollection->version) {

 					debugLogA("%s: applying patch of version %d", pCollection->szName.get(), dwVersion);

-					for (int i = 0; i < patch->n_mutations; i++) {

+					for (unsigned i = 0; i < patch->n_mutations; i++) {

 						auto &jt = *patch->mutations[i];

 						ParsePatch(pCollection, jt.record, jt.operation == WA__SYNCD_MUTATION__SYNCD_OPERATION__SET);

 					}

@@ -255,11 +255,11 @@ void WhatsAppProto::ProcessHistorySync(const Wa__HistorySync *pSync)
 	switch (pSync->synctype) {

 	case WA__HISTORY_SYNC__HISTORY_SYNC_TYPE__INITIAL_BOOTSTRAP:

 	case WA__HISTORY_SYNC__HISTORY_SYNC_TYPE__RECENT:

-		for (int i = 0; i < pSync->n_conversations; i++) {

+		for (unsigned i = 0; i < pSync->n_conversations; i++) {

 			auto *pChat = pSync->conversations[i];

 

 			auto *pUser = AddUser(pChat->id, false);

-			for (int j = 0; j < pChat->n_messages; j++) {

+			for (unsigned j = 0; j < pChat->n_messages; j++) {

 				auto *pMessage = pChat->messages[j];

 				if (!pMessage->message)

 					continue;

@@ -287,9 +287,8 @@ void WhatsAppProto::ProcessHistorySync(const Wa__HistorySync *pSync)
 						if (pChat->name)

 							setUString(pUser->hContact, "Nick", pChat->name);

 

-						GCEVENT gce = {m_szModuleName, 0, GC_EVENT_MESSAGE};

+						GCEVENT gce = { pUser->si, GC_EVENT_MESSAGE };

 						gce.dwFlags = GCEF_UTF8;

-						gce.pszID.a = pUser->szId;

 						gce.pszUID.a = key->participant;

 						gce.bIsMe = key->fromme;

 						gce.pszText.a = szMessageText.GetBuffer();

@@ -305,7 +304,7 @@ void WhatsAppProto::ProcessHistorySync(const Wa__HistorySync *pSync)
 		break;

 

 	case WA__HISTORY_SYNC__HISTORY_SYNC_TYPE__PUSH_NAME:

-		for (int i = 0; i < pSync->n_pushnames; i++) {

+		for (unsigned i = 0; i < pSync->n_pushnames; i++) {

 			auto *pName = pSync->pushnames[i];

 			if (auto *pUser = AddUser(pName->id, false))

 				setUString(pUser->hContact, "Nick", pName->pushname);

@@ -313,7 +312,7 @@ void WhatsAppProto::ProcessHistorySync(const Wa__HistorySync *pSync)
 		break;

 

 	case WA__HISTORY_SYNC__HISTORY_SYNC_TYPE__INITIAL_STATUS_V3:

-		for (int i = 0; i < pSync->n_statusv3messages;  i++) {

+		for (unsigned i = 0; i < pSync->n_statusv3messages; i++) {

 			// TODO

 			// auto *pStatus = pSync->statusv3messages[i];

 		}

diff --git a/protocols/WhatsApp/src/chats.cpp b/protocols/WhatsApp/src/chats.cpp
index b0423e5b20..f783c5f567 100644
--- a/protocols/WhatsApp/src/chats.cpp
+++ b/protocols/WhatsApp/src/chats.cpp
@@ -44,12 +44,12 @@ void WhatsAppProto::GC_ParseMetadata(const WANode *pGroup)
 

 	CMStringW wszId(Utf2T(pChatUser->szId));

 

-	pChatUser->si = Chat_NewSession(GCW_CHATROOM, m_szModuleName, wszId, getMStringW(pChatUser->hContact, "Nick"));

+	auto *si = pChatUser->si = Chat_NewSession(GCW_CHATROOM, m_szModuleName, wszId, getMStringW(pChatUser->hContact, "Nick"));

 

-	Chat_AddGroup(pChatUser->si, TranslateT("Owner"));

-	Chat_AddGroup(pChatUser->si, TranslateT("SuperAdmin"));

-	Chat_AddGroup(pChatUser->si, TranslateT("Admin"));

-	Chat_AddGroup(pChatUser->si, TranslateT("Participant"));

+	Chat_AddGroup(si, TranslateT("Owner"));

+	Chat_AddGroup(si, TranslateT("SuperAdmin"));

+	Chat_AddGroup(si, TranslateT("Admin"));

+	Chat_AddGroup(si, TranslateT("Participant"));

 

 	CMStringA szOwner(pGroup->getAttr("creator")), szNick, szRole;

 

@@ -57,9 +57,8 @@ void WhatsAppProto::GC_ParseMetadata(const WANode *pGroup)
 		if (it->title == "description") {

 			CMStringA szDescr = it->getBody();

 			if (!szDescr.IsEmpty()) {

-				GCEVENT gce = {m_szModuleName, 0, GC_EVENT_INFORMATION};

+				GCEVENT gce = { si, GC_EVENT_INFORMATION };

 				gce.dwFlags = GCEF_UTF8;

-				gce.pszID.a = pChatUser->szId;

 				gce.pszText.a = szDescr.c_str();

 				Chat_Event(&gce);

 			}

@@ -75,9 +74,8 @@ void WhatsAppProto::GC_ParseMetadata(const WANode *pGroup)
 			if (role == nullptr)

 				role = szRole;

 

-			GCEVENT gce = {m_szModuleName, 0, GC_EVENT_JOIN};

+			GCEVENT gce = { si, GC_EVENT_JOIN };

 			gce.dwFlags = GCEF_UTF8;

-			gce.pszID.a = pChatUser->szId;

 			gce.pszUID.a = jid;

 			gce.bIsMe = (jid == m_szJid);

 

@@ -112,9 +110,8 @@ void WhatsAppProto::GC_ParseMetadata(const WANode *pGroup)
 		else

 			szNick = WAJid(pszUser).user;

 

-		GCEVENT gce = { m_szModuleName, 0, GC_EVENT_TOPIC };

+		GCEVENT gce = { si, GC_EVENT_TOPIC };

 		gce.dwFlags = GCEF_UTF8;

-		gce.pszID.a	 = pChatUser->szId;

 		gce.pszUID.a = pszUser;

 		gce.pszText.a = pszSubject;

 		gce.time = iSubjectTime;

@@ -124,8 +121,8 @@ void WhatsAppProto::GC_ParseMetadata(const WANode *pGroup)
 	}

 

 	pChatUser->bInited = true;

-	Chat_Control(m_szModuleName, wszId, m_bHideGroupchats ? WINDOW_HIDDEN : SESSION_INITDONE);

-	Chat_Control(m_szModuleName, wszId, SESSION_ONLINE);

+	Chat_Control(si, m_bHideGroupchats ? WINDOW_HIDDEN : SESSION_INITDONE);

+	Chat_Control(si, SESSION_ONLINE);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/WhatsApp/src/message.cpp b/protocols/WhatsApp/src/message.cpp
index 250a63e4d1..c0efdd3ea1 100644
--- a/protocols/WhatsApp/src/message.cpp
+++ b/protocols/WhatsApp/src/message.cpp
@@ -223,9 +223,8 @@ void WhatsAppProto::ProcessMessage(WAMSG type, const Wa__WebMessageInfo &msg)
 				ProtoChainRecvMsg(pUser->hContact, &pre);

 

 				if (pUser->bIsGroupChat) {

-					GCEVENT gce = {m_szModuleName, 0, GC_EVENT_MESSAGE};

+					GCEVENT gce = { pUser->si, GC_EVENT_MESSAGE };

 					gce.dwFlags = GCEF_UTF8;

-					gce.pszID.a = pUser->szId;

 					gce.pszUID.a = participant;

 					gce.bIsMe = key->fromme;

 					gce.pszText.a = szMessageText.GetBuffer();