From f71d16b56ab90e494d6a41c276210a4ce593987e Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 1 Oct 2019 13:14:30 +0900
Subject: Room::getCurrentState()

---
 lib/room.cpp | 24 ++++++++++++++++++------
 lib/room.h   | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/lib/room.cpp b/lib/room.cpp
index e2195193..aae84416 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -202,25 +202,31 @@ public:
 
     void getPreviousContent(int limit = 10);
 
-    template <typename EventT>
-    const EventT* getCurrentState(const QString& stateKey = {}) const
+    const StateEventBase* getCurrentState(const StateEventKey& evtKey) const
     {
-        const StateEventKey evtKey { EventT::matrixTypeId(), stateKey };
         const auto* evt = currentState.value(evtKey, nullptr);
         if (!evt) {
             if (stubbedState.find(evtKey) == stubbedState.end()) {
                 // In the absence of a real event, make a stub as-if an event
                 // with empty content has been received. Event classes should be
                 // prepared for empty/invalid/malicious content anyway.
-                stubbedState.emplace(evtKey,
-                                     loadStateEvent(EventT::matrixTypeId(), {},
-                                                    stateKey));
+                stubbedState.emplace(evtKey, loadStateEvent(evtKey.first, {},
+                                                            evtKey.second));
                 qCDebug(STATE) << "A new stub event created for key {"
                                << evtKey.first << evtKey.second << "}";
             }
             evt = stubbedState[evtKey].get();
             Q_ASSERT(evt);
         }
+        Q_ASSERT(evt->matrixType() == evtKey.first
+                 && evt->stateKey() == evtKey.second);
+        return evt;
+    }
+
+    template <typename EventT>
+    const EventT* getCurrentState(const QString& stateKey = {}) const
+    {
+        const auto* evt = getCurrentState({ EventT::matrixTypeId(), stateKey });
         Q_ASSERT(evt->type() == EventT::typeId()
                  && evt->matrixType() == EventT::matrixTypeId());
         return static_cast<const EventT*>(evt);
@@ -1105,6 +1111,12 @@ bool Room::usesEncryption() const
     return !d->getCurrentState<EncryptionEvent>()->algorithm().isEmpty();
 }
 
+const StateEventBase* Room::getCurrentState(const QString& evtType,
+                                            const QString& stateKey) const
+{
+    return d->getCurrentState({ evtType, stateKey });
+}
+
 RoomEventPtr Room::decryptMessage(EncryptedEvent* encryptedEvent)
 {
     if (encryptedEvent->algorithm() == OlmV1Curve25519AesSha2AlgoKey) {
diff --git a/lib/room.h b/lib/room.h
index 698f74c8..cded7eb9 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -434,6 +434,24 @@ public:
 
     Q_INVOKABLE bool supportsCalls() const;
 
+    /// Get a state event with the given event type and state key
+    /*! This method returns a (potentially empty) state event corresponding
+     * to the pair of event type \p evtType and state key \p stateKey.
+     */
+    Q_INVOKABLE const StateEventBase*
+    getCurrentState(const QString& evtType, const QString& stateKey = {}) const;
+
+    template <typename EvT>
+    const EvT* getCurrentState(const QString& stateKey = {}) const
+    {
+        const auto* evt =
+            eventCast<const EvT>(getCurrentState(EvT::matrixTypeId(), stateKey));
+        Q_ASSERT(evt);
+        Q_ASSERT(evt->matrixTypeId() == EvT::matrixTypeId()
+                 && evt->stateKey() == stateKey);
+        return evt;
+    }
+
     template <typename EvT, typename... ArgTs>
     auto setState(ArgTs&&... args) const
     {
-- 
cgit v1.2.3