From daff357c0631d675606feb4e001c98d1742b0bb0 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 12 Jan 2018 23:22:49 +0900
Subject: Connection::getThumbnail: Add an overload for QString

Connection::getThumbnail(QString,...) is better fitting to retrieve
images for QML image providers - one doesn't need to create a QUrl
(which if made naively ends up being incorrect) and also doesn't need to
stack up "mxc://" before the mediaId. Just call Connection::getThumbnail
with the id the QML engine gives you.
---
 connection.cpp | 17 ++++++++++++++++-
 connection.h   |  5 +++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/connection.cpp b/connection.cpp
index 53a38f0d..0086320b 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -298,9 +298,24 @@ RoomMessagesJob* Connection::getMessages(Room* room, const QString& from) const
     return callApi<RoomMessagesJob>(room->id(), from);
 }
 
+inline auto splitMediaId(const QString& mediaId)
+{
+    auto idParts = mediaId.split('/');
+    Q_ASSERT_X(idParts.size() == 2, __FUNCTION__,
+               "mediaId should have a form 'serverName/localMediaId' (without apostrophes)");
+    return idParts;
+}
+
+MediaThumbnailJob* Connection::getThumbnail(const QString& mediaId, QSize requestedSize) const
+{
+    auto idParts = splitMediaId(mediaId);
+    return callApi<MediaThumbnailJob>(idParts.front(), idParts.back(),
+                                      requestedSize);
+}
+
 MediaThumbnailJob* Connection::getThumbnail(const QUrl& url, QSize requestedSize) const
 {
-    return callApi<MediaThumbnailJob>(url, requestedSize);
+    return getThumbnail(url.authority() + url.path(), requestedSize);
 }
 
 MediaThumbnailJob* Connection::getThumbnail(const QUrl& url, int requestedWidth,
diff --git a/connection.h b/connection.h
index 8dda2bbf..1d483fe8 100644
--- a/connection.h
+++ b/connection.h
@@ -174,8 +174,10 @@ namespace QMatrixClient
             void sync(int timeout = -1);
             void stopSync();
 
-            virtual MediaThumbnailJob* getThumbnail(const QUrl& url,
+            virtual MediaThumbnailJob* getThumbnail(const QString& mediaId,
                                                     QSize requestedSize) const;
+            MediaThumbnailJob* getThumbnail(const QUrl& url,
+                                            QSize requestedSize) const;
             MediaThumbnailJob* getThumbnail(const QUrl& url,
                                             int requestedWidth,
                                             int requestedHeight) const;
@@ -297,7 +299,6 @@ namespace QMatrixClient
              */
             Room* provideRoom(const QString& roomId, JoinState joinState);
 
-
             /**
              * Completes loading sync data.
              */
-- 
cgit v1.2.3