fixes #148 - add whatsapp support for group admin deletion of message…

…s sent by others
d99kris · Nov 11, 2023 · 02f91fc · 02f91fc
1 parent 4b71a18
commit 02f91fc
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 7 deletions.
diff --git a/lib/common/src/protocol.h b/lib/common/src/protocol.h
@@ -229,6 +229,7 @@ class DeleteMessageRequest : public RequestMessage
 public:
   virtual MessageType GetMessageType() const { return DeleteMessageRequestType; }
   std::string chatId;
+  std::string senderId; // only needed for wmchat
   std::string msgId;
 };
 

diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "3.96"
+#define NCHAT_VERSION "3.97"
diff --git a/lib/wmchat/go/cgowm.go b/lib/wmchat/go/cgowm.go
@@ -77,8 +77,8 @@ func CWmMarkMessageRead(connId int, chatId *C.char, msgId *C.char) int {
 }
 
 //export CWmDeleteMessage
-func CWmDeleteMessage(connId int, chatId *C.char, msgId *C.char) int {
-	return WmDeleteMessage(connId, C.GoString(chatId), C.GoString(msgId))
+func CWmDeleteMessage(connId int, chatId *C.char, senderId *C.char, msgId *C.char) int {
+	return WmDeleteMessage(connId, C.GoString(chatId), C.GoString(senderId), C.GoString(msgId))
 }
 
 //export CWmDeleteChat

diff --git a/lib/wmchat/go/gowm.go b/lib/wmchat/go/gowm.go
@@ -1946,7 +1946,7 @@ func WmMarkMessageRead(connId int, chatId string, msgId string) int {
 	return 0
 }
 
-func WmDeleteMessage(connId int, chatId string, msgId string) int {
+func WmDeleteMessage(connId int, chatId string, senderId string, msgId string) int {
 
 	LOG_TRACE("delete message " + strconv.Itoa(connId) + ", " + chatId + ", " + msgId)
 
@@ -1961,7 +1961,8 @@ func WmDeleteMessage(connId int, chatId string, msgId string) int {
 
 	// delete message
 	chatJid, _ := types.ParseJID(chatId)
-	_, err := client.RevokeMessage(chatJid, msgId)
+	senderJid, _ := types.ParseJID(senderId)
+	_, err := client.SendMessage(context.Background(), chatJid, client.BuildRevoke(chatJid, senderJid, msgId))
 
 	// log any error
 	if err != nil {

diff --git a/lib/wmchat/src/wmchat.cpp b/lib/wmchat/src/wmchat.cpp
@@ -427,9 +427,11 @@ void WmChat::PerformRequest(std::shared_ptr<RequestMessage> p_RequestMessage)
         std::shared_ptr<DeleteMessageRequest> deleteMessageRequest =
           std::static_pointer_cast<DeleteMessageRequest>(p_RequestMessage);
         std::string chatId = deleteMessageRequest->chatId;
+        std::string senderId = deleteMessageRequest->senderId;
         std::string msgId = deleteMessageRequest->msgId;
 
         int rv = CWmDeleteMessage(m_ConnId, const_cast<char*>(chatId.c_str()),
+                                  const_cast<char*>(senderId.c_str()),
                                   const_cast<char*>(msgId.c_str()));
         Status::Clear(Status::FlagUpdating);
 

diff --git a/src/nchat.1 b/src/nchat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NCHAT "1" "November 2023" "nchat v3.96" "User Commands"
+.TH NCHAT "1" "November 2023" "nchat v3.97" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS

diff --git a/src/uimodel.cpp b/src/uimodel.cpp
@@ -992,9 +992,22 @@ void UiModel::DeleteMessage()
     return;
   }
 
-  std::string msgId = *it;
+  std::string senderId;
+  const std::string msgId = *it;
+  const std::unordered_map<std::string, ChatMessage>& messages = m_Messages[profileId][chatId];
+  auto mit = messages.find(msgId);
+  if (mit != messages.end())
+  {
+    senderId = mit->second.senderId;
+  }
+  else
+  {
+    LOG_WARNING("error finding message");
+  }
+
   std::shared_ptr<DeleteMessageRequest> deleteMessageRequest = std::make_shared<DeleteMessageRequest>();
   deleteMessageRequest->chatId = chatId;
+  deleteMessageRequest->senderId = senderId;
   deleteMessageRequest->msgId = msgId;
   SendProtocolRequest(profileId, deleteMessageRequest);
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@

		#pragma once

		#define NCHAT_VERSION "3.96"
		#define NCHAT_VERSION "3.97"