fixes #280 - use original file type when forwarding files

d99kris · Aug 31, 2024 · 8730ca4 · 8730ca4
1 parent e3c6e33
commit 8730ca4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "5.2.3"
+#define NCHAT_VERSION "5.2.4"
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" "August 2024" "nchat 5.2.3" "User Commands"
+.TH NCHAT "1" "August 2024" "nchat 5.2.4" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS

diff --git a/src/uimodel.cpp b/src/uimodel.cpp
@@ -3775,12 +3775,20 @@ void UiModel::ForwardMessage()
                   selectedChatListItem.chatId.c_str());
     }
 
-    // send copy of selected message
     std::shared_ptr<SendMessageRequest> sendMessageRequest =
       std::make_shared<SendMessageRequest>();
-    sendMessageRequest->chatId = selectedChatListItem.chatId;
+
+    // prepare a new FileInfo struct if original message has a file
+    if (!message.fileInfo.empty())
+    {
+      FileInfo fileInfo = ProtocolUtil::FileInfoFromHex(message.fileInfo);
+      fileInfo.fileType = FileUtil::GetMimeType(fileInfo.filePath);
+      sendMessageRequest->chatMessage.fileInfo = ProtocolUtil::FileInfoToHex(fileInfo);
+    }
+
+    // copy text and use selected chat
     sendMessageRequest->chatMessage.text = message.text;
-    sendMessageRequest->chatMessage.fileInfo = message.fileInfo;
+    sendMessageRequest->chatId = selectedChatListItem.chatId;
 
     SendProtocolRequest(selectedChatListItem.profileId, sendMessageRequest);