Support retrieval of account and state events with alternative type ids

Author: KitsuneRal

Quotient/connection.h

@@ -180,8 +180,10 @@ class QUOTIENT_API Connection : public QObject {
     template <EventClass EventT>
     const EventT* accountData() const
     {
-        // 0.9: use the default argument and fold into the next overload
-        return eventCast<EventT>(accountData(EventT::TypeId));
+        for (auto typeId : EventT::MetaType.matrixIds)
+            if (const auto &evtPtr = accountData(typeId))
+                return eventCast<EventT>(evtPtr);
+        return nullptr;
     }
 
     template <EventClass EventT>

Quotient/roomstateview.h

@@ -50,11 +50,11 @@ class QUOTIENT_API RoomStateView
     template <Keyed_State_Event EvT>
     const EvT* get(const QString& stateKey = {}) const
     {
-        if (const auto* evt = get(EvT::TypeId, stateKey)) {
-            Q_ASSERT(evt->matrixType() == EvT::TypeId
-                     && evt->stateKey() == stateKey);
-            return eventCast<const EvT>(evt);
-        }
+        for (auto typeId : EvT::MetaType.matrixIds)
+            if (const auto *evt = get(typeId, stateKey)) {
+                Q_ASSERT(evt->matrixType() == typeId && evt->stateKey() == stateKey);
+                return eventCast<const EvT>(evt);
+            }
         return nullptr;
     }
 
@@ -66,10 +66,11 @@ class QUOTIENT_API RoomStateView
     template <Keyless_State_Event EvT>
     const EvT* get() const
     {
-        if (const auto* evt = get(EvT::TypeId)) {
-            Q_ASSERT(evt->matrixType() == EvT::TypeId);
-            return eventCast<const EvT>(evt);
-        }
+        for (auto typeId : EvT::MetaType.matrixIds)
+            if (const auto *evt = get(typeId)) {
+                Q_ASSERT(evt->matrixType() == typeId);
+                return eventCast<const EvT>(evt);
+            }
         return nullptr;
     }
 
@@ -80,20 +81,23 @@ class QUOTIENT_API RoomStateView
     template <Keyed_State_Event EvT>
     bool contains(const QString& stateKey = {}) const
     {
-        return contains(EvT::TypeId, stateKey);
+        return std::ranges::any_of(EvT::MetaType.matrixIds, [this, &stateKey](event_type_t typeId) {
+            return contains(typeId, stateKey);
+        });
     }
 
     template <Keyless_State_Event EvT>
     bool contains() const
     {
-        return contains(EvT::TypeId);
+        return std::ranges::any_of(EvT::MetaType.matrixIds,
+                                   [this](event_type_t typeId) { return contains(typeId); });
     }
 
     template <Keyed_State_Event EvT>
     auto content(const QString& stateKey,
                  typename EvT::content_type defaultValue = {}) const
     {
-        // EventBase<>::content is special in that it returns a const-ref,
+        // EventTemplate<>::content for StateEvent is special in that it returns a const-ref,
         // and lift() inside queryOr() can't wrap that in a temporary optional.
         if (const auto evt = get<EvT>(stateKey))
             return evt->content();