centralized system of processing message ids. also fixes #1375

5 files changed, 5 insertions, 15 deletions

diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index 5d1715779a..82f488f5af 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -54,7 +54,7 @@ void CVkProto::AddFeedEvent(CVKNewsItem& vkNewsItem)
 	MCONTACT hContact = FindUser(VK_FEED_USER, true);

 	T2Utf pszBody(vkNewsItem.wszText);

 

-	PROTORECVEVENT recv = { 0 };

+	PROTORECVEVENT recv = {};

 	recv.timestamp = vkNewsItem.tDate;

 	recv.szMessage = pszBody;

 

diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index 9db577a853..dab77003d9 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -292,7 +292,7 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
 

 		recv.timestamp = datetime;

 		recv.szMessage = pszBody;

-		recv.lParam = (LPARAM)szMid;

+		recv.szMsgId = szMid;

 		ProtoChainRecvMsg(hContact, &recv);

 

 		if (isRead && isOut && datetime > tLastReadMessageTime)

diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp
index d04f907043..4dcf1e2346 100644
--- a/protocols/VKontakte/src/vk_messages.cpp
+++ b/protocols/VKontakte/src/vk_messages.cpp
@@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "stdafx.h"

 

-MEVENT CVkProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)

-{

-	MEVENT hDbEvent = CSuper::RecvMsg(hContact, evt);

-	if (hDbEvent && evt->lParam)

-		db_event_setId(m_szModuleName, hDbEvent, (char*)evt->lParam);

-

-	return hDbEvent;

-}

-

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

 

 void CVkProto::SendMsgAck(void *param)

@@ -342,7 +333,7 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe
 			}

 		}

 

-		PROTORECVEVENT recv = { 0 };

+		PROTORECVEVENT recv = {};

 

 		if (isRead && bUseServerReadFlag)

 			recv.flags |= PREF_CREATEREAD;

@@ -360,7 +351,7 @@ void CVkProto::OnReceiveMessages(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe
 

 		if (!IsMessageExist(mid, vkOUT) || bEdited) {

 			debugLogA("CVkProto::OnReceiveMessages ProtoChainRecvMsg");

-			recv.lParam = (LPARAM)szMid;

+			recv.szMsgId = szMid;

 			ProtoChainRecvMsg(hContact, &recv);

 			if (mid > getDword(hContact, "lastmsgid", -1))

 				setDword(hContact, "lastmsgid", mid);

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 0ffebbc529..eda0ad160b 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -498,7 +498,7 @@ INT_PTR CVkProto::GetCaps(int type, MCONTACT)
 

 	case PFLAGNUM_4:

 		return PF4_AVATARS | PF4_SUPPORTTYPING | PF4_NOAUTHDENYREASON | PF4_IMSENDOFFLINE

-			| PF4_OFFLINEFILES | PF4_READNOTIFY | PF4_GROUPCHATFILES;

+			| PF4_OFFLINEFILES | PF4_READNOTIFY | PF4_GROUPCHATFILES | PF4_SERVERMSGID;

 

 	case PFLAGNUM_5:

 		return PF2_ONTHEPHONE;

diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index f0ee1549df..841d2a5f78 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -61,7 +61,6 @@ struct CVkProto : public PROTO<CVkProto>
 	HANDLE   SearchBasic(const wchar_t *id) override;

 	HANDLE   SearchByEmail(const wchar_t *email) override;

 	HANDLE   SearchByName(const wchar_t *nick, const wchar_t *firstName, const wchar_t *lastName) override;

-	MEVENT   RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

 	int      SendMsg(MCONTACT hContact, int flags, const char *msg) override;

 	HANDLE   SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override;

 	int      SetStatus(int iNewStatus) override;