From 0b942877182ed44ad8cb064118d1468e21a89b6b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 29 Mar 2024 10:42:25 +0300
Subject: fix: reply ids are not written for the outgoing messages

---
 plugins/Scriver/src/globals.cpp  | 5 +++++
 plugins/Scriver/src/msgutils.cpp | 1 +
 plugins/Scriver/src/sendqueue.h  | 1 +
 3 files changed, 7 insertions(+)

(limited to 'plugins/Scriver/src')

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 6ec8c203bd..406d85b751 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -123,6 +123,7 @@ static int ackevent(WPARAM, LPARAM lParam)
 		return 0;
 	}
 
+	char buf[100];
 	hContact = (db_mc_isMeta(hContact)) ? db_mc_getSrmmSub(item->hContact) : item->hContact;
 
 	DBEVENTINFO dbei = {};
@@ -133,6 +134,10 @@ static int ackevent(WPARAM, LPARAM lParam)
 	dbei.cbBlob = (int)mir_strlen(item->sendBuffer) + 1;
 	dbei.pBlob = item->sendBuffer;
 	dbei.szId = (char *)pAck->lParam;
+	if (item->hReplyEvent) {
+		itoa(item->hReplyEvent, buf, 10);
+		dbei.szReplyId = buf;
+	}
 
 	MessageWindowEvent evt = { item->hSendId, hContact, &dbei };
 	NotifyEventHooks(g_chatApi.hevPreCreate, 0, (LPARAM)&evt);
diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index 9167a4f3dd..5bfc286581 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -260,6 +260,7 @@ void CMsgDialog::MessageSend(const SendQueue::Item &msi)
 	item->hContact = m_hContact;
 	item->proto = mir_strdup(m_szProto);
 	item->flags = msi.flags;
+	item->hReplyEvent = m_hQuoteEvent;
 	item->sendBufferSize = msi.sendBufferSize;
 	item->sendBuffer = mir_strndup(msi.sendBuffer, msi.sendBufferSize);
 	SendQueue::SendItem(item);
diff --git a/plugins/Scriver/src/sendqueue.h b/plugins/Scriver/src/sendqueue.h
index 0fc3658678..a99088628f 100644
--- a/plugins/Scriver/src/sendqueue.h
+++ b/plugins/Scriver/src/sendqueue.h
@@ -36,6 +36,7 @@ namespace SendQueue
 
 		CMsgDialog *pDlg;
 		MCONTACT hContact;
+		MEVENT hReplyEvent;
 		char  *proto;
 		int    hSendId;
 		int    timeout;
-- 
cgit v1.2.3