Merge branch 'upstream' (v0.5.2)

1 files changed, 30 insertions, 1 deletions

diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index 6032132e..3f54f7bf 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -30,11 +30,24 @@ namespace QMatrixClient {
             ~StateEventBase() override = default;
 
             bool isStateEvent() const override { return true; }
+            QString replacedState() const;
+            void dumpTo(QDebug dbg) const override;
+
             virtual bool repeatsState() const;
     };
     using StateEventPtr = event_ptr_tt<StateEventBase>;
     using StateEvents = EventsArray<StateEventBase>;
 
+    template <>
+    inline bool is<StateEventBase>(const Event& e) { return e.isStateEvent(); }
+
+    /**
+     * A combination of event type and state key uniquely identifies a piece
+     * of state in Matrix.
+     * \sa https://matrix.org/docs/spec/client_server/unstable.html#types-of-room-events
+     */
+    using StateEventKey = QPair<QString, QString>;
+
     template <typename ContentT>
     struct Prev
     {
@@ -78,6 +91,12 @@ namespace QMatrixClient {
             }
 
             const ContentT& content() const { return _content; }
+            template <typename VisitorT>
+            void editContent(VisitorT&& visitor)
+            {
+                visitor(_content);
+                editJson()[ContentKeyL] = _content.toJson();
+            }
             [[deprecated("Use prevContent instead")]]
             const ContentT* prev_content() const { return prevContent(); }
             const ContentT* prevContent() const
@@ -85,8 +104,18 @@ namespace QMatrixClient {
             QString prevSenderId() const
                 { return _prev ? _prev->senderId : QString(); }
 
-        protected:
+        private:
             ContentT _content;
             std::unique_ptr<Prev<ContentT>> _prev;
     };
 } // namespace QMatrixClient
+
+namespace std {
+    template <> struct hash<QMatrixClient::StateEventKey>
+    {
+        size_t operator()(const QMatrixClient::StateEventKey& k) const Q_DECL_NOEXCEPT
+        {
+            return qHash(k);
+        }
+    };
+}