RedactionsEvent

See matrix-org/matrix-spec-proposals#4343

Author: KitsuneRal

Quotient/events/redactionevent.h

@@ -6,6 +6,8 @@
 #include "roomevent.h"
 
 namespace Quotient {
+constexpr inline auto RedactsKey = "redacts"_L1;
+
 class QUOTIENT_API RedactionEvent : public RoomEvent {
 public:
     QUO_EVENT(RedactionEvent, "m.room.redaction")
@@ -19,14 +21,19 @@ class QUOTIENT_API RedactionEvent : public RoomEvent {
     }
     QStringList redactedEvents() const
     {
-        const auto evtIdJson = contentJson()["redacts"_ls];
+        const auto evtIdJson = contentJson()["redacts"_L1];
         if (evtIdJson.isArray())
             return fromJson<QStringList>(evtIdJson); // MSC2244: a list of ids
         if (evtIdJson.isString())
             return { fromJson<QString>(evtIdJson) }; // MSC2174: id in content
-        return { fullJson()["redacts"_ls].toString() }; // legacy fallback
+        return { fullJson()["redacts"_L1].toString() }; // legacy fallback
     }
 
     QUO_CONTENT_GETTER(QString, reason)
 };
+
+QUO_DEFINE_SIMPLE_EVENT(RedactionsEvent, RoomEvent,
+                        QUO_LIST("org.matrix.msc4343.redactions", "m.room.redactions"), QStringList,
+                        redactedEvents, RedactsKey)
+
 } // namespace Quotient

Quotient/room.cpp

@@ -2720,17 +2720,14 @@ RoomEventPtr makeRedacted(const RoomEvent& target,
     }
     if (!target.is<RoomCreateEvent>()) { // See MSC2176 on create events
         static const QHash<QString, QStringList> ContentKeysToKeepPerType{
-            { RedactionEvent::TypeId, { "redacts"_L1 } },
-            { RoomMemberEvent::TypeId,
-              { "membership"_L1, "join_authorised_via_users_server"_L1 } },
-            { RoomPowerLevelsEvent::TypeId,
-              { "ban"_L1, "events"_L1, "events_default"_L1, "invite"_L1,
-                "kick"_L1, "redact"_L1, "state_default"_L1, "users"_L1,
-                "users_default"_L1 } },
-            // TODO: Replace with RoomJoinRules::TypeId etc. once available
-            { "m.room.join_rules"_L1, { "join_rule"_L1, "allow"_L1 } },
-            { "m.room.history_visibility"_L1, { "history_visibility"_L1 } }
-        };
+            {RedactionEvent::TypeId, {RedactsKey}},
+            {RoomMemberEvent::TypeId, {"membership"_L1, "join_authorised_via_users_server"_L1}},
+            {RoomPowerLevelsEvent::TypeId,
+             {"ban"_L1, "events"_L1, "events_default"_L1, "invite"_L1, "kick"_L1, "redact"_L1,
+              "state_default"_L1, "users"_L1, "users_default"_L1}},
+            {JoinRulesEvent::TypeId, {"join_rule"_L1, "allow"_L1}},
+            // TODO: Replace with ::TypeId once available
+            {"m.room.history_visibility"_L1, {"history_visibility"_L1}}};
 
         if (const auto contentKeysToKeep = ContentKeysToKeepPerType.value(target.matrixType());
             !contentKeysToKeep.isEmpty()) //