Update upstream source from tag 'upstream/0.7.0'

Update to upstream version '0.7.0'
with Debian dir 30dcb77a77433e4a54eab77c0b82ae925dead2d8

1 files changed, 12 insertions, 14 deletions

diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h
index f3d7309a..2ba66a35 100644
--- a/lib/csapi/content-repo.h
+++ b/lib/csapi/content-repo.h
@@ -14,7 +14,7 @@ namespace Quotient {
 /*! \brief Upload some content to the content repository.
  *
  */
-class UploadContentJob : public BaseJob {
+class QUOTIENT_API UploadContentJob : public BaseJob {
 public:
     /*! \brief Upload some content to the content repository.
      *
@@ -34,16 +34,13 @@ public:
 
     /// The [MXC URI](/client-server-api/#matrix-content-mxc-uris) to the
     /// uploaded content.
-    QString contentUri() const
-    {
-        return loadFromJson<QString>("content_uri"_ls);
-    }
+    QUrl contentUri() const { return loadFromJson<QUrl>("content_uri"_ls); }
 };
 
 /*! \brief Download content from the content repository.
  *
  */
-class GetContentJob : public BaseJob {
+class QUOTIENT_API GetContentJob : public BaseJob {
 public:
     /*! \brief Download content from the content repository.
      *
@@ -90,7 +87,7 @@ public:
  * the previous endpoint) but replace the target file name with the one
  * provided by the caller.
  */
-class GetContentOverrideNameJob : public BaseJob {
+class QUOTIENT_API GetContentOverrideNameJob : public BaseJob {
 public:
     /*! \brief Download content from the content repository overriding the file
      * name
@@ -145,7 +142,7 @@ public:
  * See the [Thumbnails](/client-server-api/#thumbnails) section for more
  * information.
  */
-class GetContentThumbnailJob : public BaseJob {
+class QUOTIENT_API GetContentThumbnailJob : public BaseJob {
 public:
     /*! \brief Download a thumbnail of content from the content repository
      *
@@ -165,7 +162,8 @@ public:
      *
      * \param method
      *   The desired resizing method. See the
-     * [Thumbnails](/client-server-api/#thumbnails) section for more information.
+     * [Thumbnails](/client-server-api/#thumbnails) section for more
+     * information.
      *
      * \param allowRemote
      *   Indicates to the server that it should not attempt to fetch
@@ -207,7 +205,7 @@ public:
  * do not want to share with the homeserver, and this can mean that the URLs
  * being shared should also not be shared with the homeserver.
  */
-class GetUrlPreviewJob : public BaseJob {
+class QUOTIENT_API GetUrlPreviewJob : public BaseJob {
 public:
     /*! \brief Get information about a URL for a client
      *
@@ -219,14 +217,14 @@ public:
      *   return a newer version if it does not have the requested version
      *   available.
      */
-    explicit GetUrlPreviewJob(const QString& url, Omittable<qint64> ts = none);
+    explicit GetUrlPreviewJob(const QUrl& url, Omittable<qint64> ts = none);
 
     /*! \brief Construct a URL without creating a full-fledged job object
      *
      * This function can be used when a URL for GetUrlPreviewJob
      * is necessary but the job itself isn't.
      */
-    static QUrl makeRequestUrl(QUrl baseUrl, const QString& url,
+    static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& url,
                                Omittable<qint64> ts = none);
 
     // Result properties
@@ -239,7 +237,7 @@ public:
 
     /// An [MXC URI](/client-server-api/#matrix-content-mxc-uris) to the image.
     /// Omitted if there is no image.
-    QString ogImage() const { return loadFromJson<QString>("og:image"_ls); }
+    QUrl ogImage() const { return loadFromJson<QUrl>("og:image"_ls); }
 };
 
 /*! \brief Get the configuration for the content repository.
@@ -255,7 +253,7 @@ public:
  * content repository APIs, for example, proxies may enforce a lower upload size
  * limit than is advertised by the server on this endpoint.
  */
-class GetConfigJob : public BaseJob {
+class QUOTIENT_API GetConfigJob : public BaseJob {
 public:
     /// Get the configuration for the content repository.
     explicit GetConfigJob();