From 0ea083cbd4013cf2e709a3e3810ae96167585a74 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 10 Sep 2022 22:17:34 +0200 Subject: Matrix: better name for clipboard file (with extension), give pantalaimon files proper filenames when downloading --- src/plugins/Matrix.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp index f8ee2a2..00009fd 100644 --- a/src/plugins/Matrix.cpp +++ b/src/plugins/Matrix.cpp @@ -3671,7 +3671,7 @@ namespace QuickMedia { return filepath.c_str() + index + 1; } - PluginResult Matrix::post_file(RoomData *room, const std::string &filepath, std::string &event_id_response, std::string &err_msg) { + PluginResult Matrix::post_file(RoomData *room, const std::string &filepath, std::string filename, std::string &event_id_response, std::string &err_msg) { UploadInfo file_info; UploadInfo thumbnail_info; PluginResult upload_file_result = upload_file(room, filepath, file_info, thumbnail_info, err_msg); @@ -3683,7 +3683,9 @@ namespace QuickMedia { if(!thumbnail_info.content_uri.empty()) thumbnail_info_opt = std::move(thumbnail_info); - const char *filename = file_get_filename(filepath); + if(filename.empty()) + filename = file_get_filename(filepath); + return post_message(room, filename, event_id_response, file_info_opt, thumbnail_info_opt); } -- cgit v1.2.3