Merge branch 'upstream' (v0.5.2)

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/user.h b/lib/user.h
index 17f5625f..7c9ed55f 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -105,7 +105,11 @@ namespace QMatrixClient
             QString avatarMediaId(const Room* room = nullptr) const;
             QUrl avatarUrl(const Room* room = nullptr) const;
 
-            void processEvent(const RoomMemberEvent& event, const Room* r);
+            /// This method is for internal use and should not be called
+            /// from client code
+            // FIXME: Move it away to private in lib 0.6
+            void processEvent(const RoomMemberEvent& event, const Room* r,
+                              bool firstMention);
 
         public slots:
             /** Set a new name in the global user profile */
@@ -125,6 +129,8 @@ namespace QMatrixClient
             void ignore();
             /** Remove the user from the ignore list */
             void unmarkIgnore();
+            /** Check whether the user is in ignore list */
+            bool isIgnored() const;
 
         signals:
             void nameAboutToChange(QString newName, QString oldName,