From fdff209744ac4c422f63fe2549aa0132df7e6292 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Fri, 21 Jan 2022 02:04:10 +0100
Subject: Redo EventRelation; deprecate RelatesTo

RelatesTo and EventRelation have been two means to the same end in two
different contexts. (Modernised) EventRelation is the one used now both
for ReactionEvent and EventContent::TextContent. The modernisation
mostly boils down to using inline variables instead of functions to
return relation types and switching to QLatin1String from const char*
(because we know exactly that those constants are Latin-1 and
QLatin1String is more efficient than const char* to compare/convert to
QString).
---
 lib/events/eventrelation.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 lib/events/eventrelation.h

(limited to 'lib/events/eventrelation.h')

diff --git a/lib/events/eventrelation.h b/lib/events/eventrelation.h
new file mode 100644
index 00000000..e445ee42
--- /dev/null
+++ b/lib/events/eventrelation.h
@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: 2022 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include "converters.h"
+
+namespace Quotient {
+
+[[maybe_unused]] constexpr auto RelatesToKey = "m.relates_to"_ls;
+constexpr auto RelTypeKey = "rel_type"_ls;
+
+struct QUOTIENT_API EventRelation {
+    using reltypeid_t = QLatin1String;
+
+    QString type;
+    QString eventId;
+    QString key = {}; // Only used for m.annotation for now
+
+    static constexpr auto ReplyType = "m.in_reply_to"_ls;
+    static constexpr auto AnnotationType = "m.annotation"_ls;
+    static constexpr auto ReplacementType = "m.replace"_ls;
+
+    static EventRelation replyTo(QString eventId)
+    {
+        return { ReplyType, std::move(eventId) };
+    }
+    static EventRelation annotate(QString eventId, QString key)
+    {
+        return { AnnotationType, std::move(eventId), std::move(key) };
+    }
+    static EventRelation replace(QString eventId)
+    {
+        return { ReplacementType, std::move(eventId) };
+    }
+
+    [[deprecated("Use ReplyRelation variable instead")]]
+    static constexpr auto Reply() { return ReplyType; }
+    [[deprecated("Use AnnotationRelation variable instead")]] //
+    static constexpr auto Annotation() { return AnnotationType; }
+    [[deprecated("Use ReplacementRelation variable instead")]] //
+    static constexpr auto Replacement() { return ReplacementType; }
+};
+
+template <>
+struct QUOTIENT_API JsonObjectConverter<EventRelation> {
+    static void dumpTo(QJsonObject& jo, const EventRelation& pod);
+    static void fillFrom(const QJsonObject& jo, EventRelation& pod);
+};
+
+}
+
-- 
cgit v1.2.3


From 607489a2e6a3e3238eac0178f5c7bbc70f178f46 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Wed, 22 Jun 2022 20:43:50 +0200
Subject: Fix deprecation messages

[skip ci]
---
 lib/events/eventrelation.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/events/eventrelation.h')

diff --git a/lib/events/eventrelation.h b/lib/events/eventrelation.h
index e445ee42..2a841cf1 100644
--- a/lib/events/eventrelation.h
+++ b/lib/events/eventrelation.h
@@ -34,11 +34,11 @@ struct QUOTIENT_API EventRelation {
         return { ReplacementType, std::move(eventId) };
     }
 
-    [[deprecated("Use ReplyRelation variable instead")]]
+    [[deprecated("Use ReplyType variable instead")]]
     static constexpr auto Reply() { return ReplyType; }
-    [[deprecated("Use AnnotationRelation variable instead")]] //
+    [[deprecated("Use AnnotationType variable instead")]] //
     static constexpr auto Annotation() { return AnnotationType; }
-    [[deprecated("Use ReplacementRelation variable instead")]] //
+    [[deprecated("Use ReplacementType variable instead")]] //
     static constexpr auto Replacement() { return ReplacementType; }
 };
 
-- 
cgit v1.2.3