Merge branch 'master' into kitsune-gtad

1 files changed, 6 insertions, 2 deletions

diff --git a/user.h b/user.h
index 91dfdc09..8a2c53d9 100644
--- a/user.h
+++ b/user.h
@@ -33,6 +33,8 @@ namespace QMatrixClient
             Q_PROPERTY(QString name READ name NOTIFY nameChanged)
             Q_PROPERTY(QString displayName READ displayname NOTIFY nameChanged STORED false)
             Q_PROPERTY(QString bridgeName READ bridged NOTIFY nameChanged STORED false)
+            Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
+            Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY avatarChanged)
         public:
             User(QString userId, Connection* connection);
             ~User() override;
@@ -57,11 +59,12 @@ namespace QMatrixClient
             */
             QString bridged() const;
 
-            const Avatar& avatarObject();
+            const Avatar& avatarObject() const;
             Q_INVOKABLE QImage avatar(int dimension);
             Q_INVOKABLE QImage avatar(int requestedWidth, int requestedHeight);
 
-            Q_INVOKABLE QUrl avatarUrl() const;
+            QString avatarMediaId() const;
+            QUrl avatarUrl() const;
 
             void processEvent(Event* event);
 
@@ -83,3 +86,4 @@ namespace QMatrixClient
             Private* d;
     };
 }
+Q_DECLARE_METATYPE(QMatrixClient::User*)