More work on touch (behind QM_ENABLE_TOUCH=1 environment variable), save thumbnails with their size so using a different scaling will update thumbnails to the same scale

1 files changed, 11 insertions, 4 deletions

diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index aa6de40..263a948 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -6,11 +6,13 @@
 #include "../../include/Program.hpp"
 #include "../../include/base64_url.hpp"
 #include "../../include/Json.hpp"
+#include "../../include/Utils.hpp"
 #include <rapidjson/document.h>
 #include <rapidjson/writer.h>
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/filereadstream.h>
 #include <rapidjson/filewritestream.h>
+#include <cmath>
 #include <fcntl.h>
 #include <unistd.h>
 #include "../../include/QuickMedia.hpp"
@@ -1602,6 +1604,11 @@ namespace QuickMedia {
         return media_url.substr(start, end - start);
     }
 
+    static std::string get_thumbnail_url(const std::string &homeserver, const std::string &mxc_id) {
+        std::string size = std::to_string(int(32 * get_ui_scale()));
+        return homeserver + "/_matrix/media/r0/thumbnail/" + mxc_id + "?width=" + size + "&height=" + size + "&method=crop";
+    }
+
     std::shared_ptr<UserInfo> Matrix::parse_user_info(const rapidjson::Value &json, const std::string &user_id, RoomData *room_data) {
         assert(json.IsObject());
         std::string avatar_url_str;
@@ -1614,7 +1621,7 @@ namespace QuickMedia {
         std::string display_name = display_name_json.IsString() ? display_name_json.GetString() : user_id;
         std::string avatar_url = thumbnail_url_extract_media_id(avatar_url_str);
         if(!avatar_url.empty())
-            avatar_url = homeserver + "/_matrix/media/r0/thumbnail/" + avatar_url + "?width=32&height=32&method=crop"; // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
+            avatar_url = get_thumbnail_url(homeserver, avatar_url); // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
         //auto user_info = std::make_shared<UserInfo>(room_data, user_id, std::move(display_name), std::move(avatar_url));
         // Overwrites user data
         //room_data->add_user(user_info);
@@ -1983,7 +1990,7 @@ namespace QuickMedia {
                             body = user_display_name + " changed their profile picture";
                             std::string new_avatar_url_str = thumbnail_url_extract_media_id(new_avatar_url_json.GetString());
                             if(!new_avatar_url_str.empty())
-                                new_avatar_url_str = homeserver + "/_matrix/media/r0/thumbnail/" + new_avatar_url_str + "?width=32&height=32&method=crop"; // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
+                                new_avatar_url_str = get_thumbnail_url(homeserver, new_avatar_url_str); // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
                             room_data->set_user_avatar_url(user, std::move(new_avatar_url_str));
                         } else if((!new_avatar_url_json.IsString() || new_avatar_url_json.GetStringLength() == 0) && prev_avatar_url_json.IsString()) {
                             body = user_display_name + " removed their profile picture";
@@ -2200,7 +2207,7 @@ namespace QuickMedia {
                 continue;
 
             std::string url_json_str = url_json.GetString() + 6;
-            room_data->set_avatar_url(homeserver + "/_matrix/media/r0/thumbnail/" + thumbnail_url_extract_media_id(url_json_str) + "?width=32&height=32&method=crop");
+            room_data->set_avatar_url(get_thumbnail_url(homeserver, thumbnail_url_extract_media_id(url_json_str)));
             room_data->avatar_is_fallback = false;
         }
     }
@@ -3742,7 +3749,7 @@ namespace QuickMedia {
             if(avatar_url_json.IsString())
                 avatar_url = std::string(avatar_url_json.GetString(), avatar_url_json.GetStringLength());
             if(!avatar_url.empty())
-                avatar_url = homeserver + "/_matrix/media/r0/thumbnail/" + thumbnail_url_extract_media_id(avatar_url) + "?width=32&height=32&method=crop"; // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
+                avatar_url = get_thumbnail_url(homeserver, thumbnail_url_extract_media_id(avatar_url)); // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
             room->set_user_avatar_url(user, std::move(avatar_url));
             room->set_user_display_name(user, std::move(display_name));
         }