From 2bddad9701422b9fcf01c547a10054eb17ccdceb Mon Sep 17 00:00:00 2001 From: dec05eba Date: Fri, 11 Nov 2022 19:40:30 +0100 Subject: Dont format matrix reaction locally, bypass pantalaimon for custom emoji --- src/QuickMedia.cpp | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'src/QuickMedia.cpp') diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 433442a..c94951d 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -5435,26 +5435,6 @@ namespace QuickMedia { return message; } - static std::string pantalaimon_image_proxy_url_to_remote_image_url(Matrix *matrix, const std::string &image_url) { - std::string remote_homeserver_url = matrix->get_remote_homeserver_url(); - if(!remote_homeserver_url.empty() && remote_homeserver_url.back() == '/') - remote_homeserver_url.pop_back(); - - std::string result_url = image_url; - - if(string_starts_with(result_url, "http://")) - result_url.erase(result_url.begin(), result_url.begin() + 7); - else if(string_starts_with(result_url, "https://")) - result_url.erase(result_url.begin(), result_url.begin() + 8); - - size_t path_index = result_url.find('/'); - if(path_index == std::string::npos) - return remote_homeserver_url; - - result_url.replace(0, path_index, remote_homeserver_url); - return result_url; - } - bool Program::chat_page(MatrixChatPage *matrix_chat_page, RoomData *current_room) { assert(current_room); assert(strcmp(plugin_name, "matrix") == 0); @@ -6117,10 +6097,14 @@ namespace QuickMedia { auto message = std::make_shared(); message->body_is_formatted = true; message->user = matrix->get_me(current_room); - if(msgtype == "m.emote") + if(msgtype == "m.emote") { message->body = "*" + current_room->get_user_display_name(me) + "* " + matrix->body_to_formatted_body(current_room, text); - else + } else if(msgtype == "m.reaction") { + message->body = text; + message->body_is_formatted = false; + } else { message->body = matrix->body_to_formatted_body(current_room, text); + } message->type = MessageType::TEXT; message->timestamp = time(NULL) * 1000; @@ -6910,7 +6894,7 @@ namespace QuickMedia { if(selected_item_message->type == MessageType::VIDEO) image_url = selected_item->thumbnail_url; - image_url = pantalaimon_image_proxy_url_to_remote_image_url(matrix, image_url); + image_url = pantalaimon_url_to_homeserver_url(matrix, image_url); std::vector saucenao_tabs; saucenao_tabs.push_back(Tab{create_body(), std::make_unique(this, image_url, false), nullptr}); -- cgit v1.2.3