From 8f9292d483fcf3a10d9284512359c4562f5311eb Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 11 Apr 2023 17:07:04 +0300
Subject: DB::FILE_BLOB - file events' access unification

---
 protocols/Discord/src/server.cpp    |  2 +-
 protocols/EmLanProto/src/mlan.cpp   |  5 ++---
 protocols/ICQCorp/src/services.cpp  |  6 ++----
 protocols/ICQCorp/src/stdafx.h      | 12 ++++++------
 protocols/SkypeWeb/src/skype_db.cpp |  2 +-
 5 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Discord/src/server.cpp b/protocols/Discord/src/server.cpp
index 7ac73e38bf..839cf698b5 100644
--- a/protocols/Discord/src/server.cpp
+++ b/protocols/Discord/src/server.cpp
@@ -124,7 +124,7 @@ void CDiscordProto::OnReceiveHistory(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest
 		_i64toa_s(msgid, szMsgId, _countof(szMsgId), 10);
 		MEVENT hDbEvent = db_event_getById(m_szModuleName, szMsgId);
 		if (hDbEvent != 0)
-			bSucceeded = 0 == db_event_edit(pUser->hContact, hDbEvent, &dbei);
+			bSucceeded = 0 == db_event_edit(hDbEvent, &dbei);
 			
 		if (!bSucceeded) {
 			dbei.szId = szMsgId;
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp
index 84dd998b60..535a42a7aa 100644
--- a/protocols/EmLanProto/src/mlan.cpp
+++ b/protocols/EmLanProto/src/mlan.cpp
@@ -907,13 +907,12 @@ void CMLan::RecvFile(CCSDATA *ccs)
 	char *szFile = pre->szMessage + sizeof(uint32_t);
 	char *szDesc = szFile + mir_strlen(szFile) + 1;
 
-	DBEVENTINFO dbei = {};
+	DB::EventInfo dbei;
 	dbei.szModule = MODULENAME;
 	dbei.timestamp = pre->timestamp;
 	dbei.flags = pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);
 	dbei.eventType = EVENTTYPE_FILE;
-	dbei.cbBlob = uint32_t(sizeof(uint32_t) + mir_strlen(szFile) + mir_strlen(szDesc) + 2);
-	dbei.pBlob = (uint8_t*)pre->szMessage;
+	DB::FILE_BLOB(_A2T(szFile), _A2T(szDesc)).write(dbei);
 	db_event_add(ccs->hContact, &dbei);
 }
 
diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp
index 07301b8e7a..799c6172f6 100644
--- a/protocols/ICQCorp/src/services.cpp
+++ b/protocols/ICQCorp/src/services.cpp
@@ -368,15 +368,13 @@ static INT_PTR icqRecvFile(WPARAM, LPARAM lParam)
 	char *szFile = pre->szMessage + sizeof(uint32_t);
 	char *szDesc = szFile + mir_strlen(szFile) + 1;
 
-	DBEVENTINFO dbei = {};
+	DB::EventInfo dbei;
 	dbei.szModule = protoName;
 	dbei.timestamp = pre->timestamp;
 	dbei.flags = pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);
 	dbei.eventType = EVENTTYPE_FILE;
-	dbei.cbBlob = sizeof(uint32_t) + (uint32_t)mir_strlen(szFile) + (uint32_t)mir_strlen(szDesc) + 2;
-	dbei.pBlob = (uint8_t*)pre->szMessage;
+	DB::FILE_BLOB(_A2T(szFile), _A2T(szDesc)).write(dbei);
 	db_event_add(ccs->hContact, &dbei);
-
 	return 0;
 }
 
diff --git a/protocols/ICQCorp/src/stdafx.h b/protocols/ICQCorp/src/stdafx.h
index fb733d654a..c5ac8e73ad 100644
--- a/protocols/ICQCorp/src/stdafx.h
+++ b/protocols/ICQCorp/src/stdafx.h
@@ -28,16 +28,16 @@
 #include <time.h>
 
 #include <newpluginapi.h>
+#include <m_clist.h>
 #include <m_contacts.h>
-#include <m_protosvc.h>
-#include <m_langpack.h>
 #include <m_database.h>
+#include <m_langpack.h>
+#include <m_netlib.h>
 #include <m_options.h>
-#include <statusmodes.h>
-#include <m_clist.h>
-#include <m_userinfo.h>
+#include <m_protosvc.h>
 #include <m_timezones.h>
-#include <m_netlib.h>
+#include <m_userinfo.h>
+#include <statusmodes.h>
 
 #include "user.h"
 #include "transfer.h"
diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp
index 47a8272777..0fb627a2cb 100644
--- a/protocols/SkypeWeb/src/skype_db.cpp
+++ b/protocols/SkypeWeb/src/skype_db.cpp
@@ -94,7 +94,7 @@ void CSkypeProto::EditEvent(MCONTACT hContact, MEVENT hEvent, const CMStringW &s
 	std::string newMsg = jMsg.write().c_str();
 	dbei.cbBlob = int(newMsg.size() + 1);
 	dbei.pBlob = (uint8_t*)newMsg.c_str();
-	db_event_edit(hContact, hEvent, &dbei);
+	db_event_edit(hEvent, &dbei);
 }
 
 void CSkypeProto::InitDBEvents()
-- 
cgit v1.2.3