Matrix: authenticated media requests with access token

1 files changed, 47 insertions, 18 deletions

diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 7080bf9..5817fe3 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -1370,6 +1370,35 @@ namespace QuickMedia {
         }
     }
 
+    const char* MatrixVideoPage::get_title() const {
+        return "";
+    }
+
+    std::string MatrixVideoPage::get_filename() {
+        return filename;
+    }
+
+    std::string MatrixVideoPage::get_download_url_for_clipboard(int max_height) {
+        std::string download_url = get_download_url(max_height);
+        size_t index = download_url.find("?access_token=");
+        if(index == std::string::npos) {
+            index = download_url.find("&access_token=");
+            if(index == std::string::npos)
+                return download_url;
+        }
+
+        size_t end = download_url.find('&', index + 14);
+        if(end == std::string::npos) {
+            end = download_url.size();
+        } else {
+            ++index;
+            ++end;
+        }
+
+        download_url.erase(index, end - index);
+        return download_url;
+    }
+
     MatrixChatPage::MatrixChatPage(Program *program, std::string room_id, MatrixRoomsPage *rooms_page, std::string jump_to_event_id) :
         Page(program), room_id(std::move(room_id)), rooms_page(rooms_page), jump_to_event_id(std::move(jump_to_event_id))
     {
@@ -2474,16 +2503,16 @@ namespace QuickMedia {
         return media_url.substr(start, end - start);
     }
 
-    static std::string get_avatar_thumbnail_url(const std::string &homeserver, const std::string &mxc_id) {
+    static std::string get_avatar_thumbnail_url(const std::string &homeserver, const std::string &access_token, const std::string &mxc_id) {
         if(mxc_id.empty())
             return "";
 
         std::string size = std::to_string(int(32 * get_config().scale));
-        return homeserver + "/_matrix/media/r0/thumbnail/" + mxc_id + "?width=" + size + "&height=" + size + "&method=crop";
+        return homeserver + "/_matrix/client/v1/media/thumbnail/" + mxc_id + "?width=" + size + "&height=" + size + "&method=crop&access_token=" + access_token;
     }
 
     std::string Matrix::get_media_url(const std::string &mxc_id) {
-        return homeserver + "/_matrix/media/r0/download/" + thumbnail_url_extract_media_id(mxc_id);
+        return homeserver + "/_matrix/client/v1/media/download/" + thumbnail_url_extract_media_id(mxc_id) + "?access_token=" + access_token;
     }
 
     RoomExtraData& Matrix::get_room_extra_data(RoomData *room) {
@@ -2502,7 +2531,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 = get_avatar_thumbnail_url(homeserver, avatar_url); // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
+            avatar_url = get_avatar_thumbnail_url(homeserver, access_token, 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);
@@ -2599,7 +2628,7 @@ namespace QuickMedia {
         return found_resolution;
     }
 
-    static std::string message_content_extract_thumbnail_url(const rapidjson::Value &content_json, const std::string &homeserver) {
+    static std::string message_content_extract_thumbnail_url(const rapidjson::Value &content_json, const std::string &homeserver, const std::string &access_token) {
         const rapidjson::Value &info_json = GetMember(content_json, "info");
         if(info_json.IsObject()) {
             const rapidjson::Value &thumbnail_url_json = GetMember(info_json, "thumbnail_url");
@@ -2609,7 +2638,7 @@ namespace QuickMedia {
                     return "";
 
                 thumbnail_str.erase(thumbnail_str.begin(), thumbnail_str.begin() + 6);
-                return homeserver + "/_matrix/media/r0/download/" + std::move(thumbnail_str);
+                return homeserver + "/_matrix/client/v1/media/download/" + std::move(thumbnail_str) + "?access_token=" + access_token;
             }
         }
 
@@ -3196,7 +3225,7 @@ namespace QuickMedia {
                             body = user_display_name + " changed his 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 = get_avatar_thumbnail_url(homeserver, new_avatar_url_str); // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
+                                new_avatar_url_str = get_avatar_thumbnail_url(homeserver, access_token, new_avatar_url_str); // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
                             new_avatar_url = new_avatar_url_str;
                             update_user_display_info = room_data->set_user_avatar_url(user, std::move(new_avatar_url_str), timestamp);
                         } else if((!new_avatar_url_json.IsString() || new_avatar_url_json.GetStringLength() == 0) && prev_avatar_url_json.IsString()) {
@@ -3422,8 +3451,8 @@ namespace QuickMedia {
             if(!url_json.IsString() || strncmp(url_json.GetString(), "mxc://", 6) != 0)
                 return nullptr;
 
-            message->url = homeserver + "/_matrix/media/r0/download/" + (url_json.GetString() + 6);
-            message->thumbnail_url = message_content_extract_thumbnail_url(*content_json, homeserver);
+            message->url = homeserver + "/_matrix/client/v1/media/download/" + (url_json.GetString() + 6) + "?access_token=" + access_token;
+            message->thumbnail_url = message_content_extract_thumbnail_url(*content_json, homeserver, access_token);
             message_content_extract_thumbnail_size(*content_json, message->thumbnail_size);
             message->type = MessageType::IMAGE;
         } else if(!content_type.IsString() || strcmp(content_type.GetString(), "m.text") == 0) {
@@ -3433,8 +3462,8 @@ namespace QuickMedia {
             if(!url_json.IsString() || strncmp(url_json.GetString(), "mxc://", 6) != 0)
                 return nullptr;
 
-            message->url = homeserver + "/_matrix/media/r0/download/" + (url_json.GetString() + 6);
-            message->thumbnail_url = message_content_extract_thumbnail_url(*content_json, homeserver);
+            message->url = homeserver + "/_matrix/client/v1/media/download/" + (url_json.GetString() + 6) + "?access_token=" + access_token;
+            message->thumbnail_url = message_content_extract_thumbnail_url(*content_json, homeserver, access_token);
             message_content_extract_thumbnail_size(*content_json, message->thumbnail_size);
             message->type = MessageType::VIDEO;
             if(message->thumbnail_url.empty())
@@ -3444,7 +3473,7 @@ namespace QuickMedia {
             if(!url_json.IsString() || strncmp(url_json.GetString(), "mxc://", 6) != 0)
                 return nullptr;
 
-            message->url = homeserver + "/_matrix/media/r0/download/" + (url_json.GetString() + 6);
+            message->url = homeserver + "/_matrix/client/v1/media/download/" + (url_json.GetString() + 6) + "?access_token=" + access_token;
             message->type = MessageType::AUDIO;
             prefix = "🎵 Play ";
         } else if(strcmp(content_type.GetString(), "m.file") == 0) {
@@ -3452,7 +3481,7 @@ namespace QuickMedia {
             if(!url_json.IsString() || strncmp(url_json.GetString(), "mxc://", 6) != 0)
                 return nullptr;
 
-            message->url = homeserver + "/_matrix/media/r0/download/" + (url_json.GetString() + 6);
+            message->url = homeserver + "/_matrix/client/v1/media/download/" + (url_json.GetString() + 6) + "?access_token=" + access_token;
             message->type = MessageType::FILE;
             prefix = "💾 Download ";
         } else if(strcmp(content_type.GetString(), "m.emote") == 0) { // this is a /me message, TODO: show /me messages differently
@@ -3467,7 +3496,7 @@ namespace QuickMedia {
                 prefix = geo_uri_json.GetString() + std::string(" | ");
 
             message->type = MessageType::TEXT;
-            message->thumbnail_url = message_content_extract_thumbnail_url(*content_json, homeserver);
+            message->thumbnail_url = message_content_extract_thumbnail_url(*content_json, homeserver, access_token);
             message_content_extract_thumbnail_size(*content_json, message->thumbnail_size);
         } else if(strcmp(content_type.GetString(), "m.server_notice") == 0) { // TODO: show server notices differently
             message->type = MessageType::TEXT;
@@ -3627,7 +3656,7 @@ namespace QuickMedia {
                 if(!url_json.IsString() || strncmp(url_json.GetString(), "mxc://", 6) != 0)
                     continue;
 
-                update_room_avatar_url |= room_data->set_avatar_url(get_avatar_thumbnail_url(homeserver, thumbnail_url_extract_media_id(url_json.GetString())), item_timestamp);
+                update_room_avatar_url |= room_data->set_avatar_url(get_avatar_thumbnail_url(homeserver, access_token, thumbnail_url_extract_media_id(url_json.GetString())), item_timestamp);
                 room_data->avatar_is_fallback = false;
             } else if(strcmp(type_json.GetString(), "m.room.topic") == 0) {
                 const rapidjson::Value &content_json = GetMember(event_item_json, "content");
@@ -5778,7 +5807,7 @@ namespace QuickMedia {
                 if(avatar_url_json.IsString()) {
                     std::string avatar_url = thumbnail_url_extract_media_id(avatar_url_json.GetString());
                     if(!avatar_url.empty())
-                        avatar_url = get_avatar_thumbnail_url(homeserver, avatar_url);
+                        avatar_url = get_avatar_thumbnail_url(homeserver, access_token, avatar_url);
 
                     if(!avatar_url.empty())
                         room_body_item->thumbnail_url = std::move(avatar_url);
@@ -5850,7 +5879,7 @@ namespace QuickMedia {
             if(avatar_url_json.IsString()) {
                 std::string avatar_url = thumbnail_url_extract_media_id(std::string(avatar_url_json.GetString(), avatar_url_json.GetStringLength()));
                 if(!avatar_url.empty())
-                    avatar_url = get_avatar_thumbnail_url(homeserver, avatar_url);
+                    avatar_url = get_avatar_thumbnail_url(homeserver, access_token, avatar_url);
                 body_item->thumbnail_url = std::move(avatar_url);
             }
             body_item->thumbnail_mask_type = ThumbnailMaskType::CIRCLE;
@@ -6089,7 +6118,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 = get_avatar_thumbnail_url(homeserver, thumbnail_url_extract_media_id(avatar_url)); // TODO: Remove the constant strings around to reduce memory usage (6.3mb)
+                avatar_url = get_avatar_thumbnail_url(homeserver, access_token, 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, avatar_url, 0);
             room->set_user_display_name(user, display_name, 0);