forked from quotient-im/Quaternion
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request quotient-im#341 from quotient-im/kitsune-relations
Reactions and edited messages support
- Loading branch information
Showing
13 changed files
with
464 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /****************************************************************************** | ||
| * Copyright (C) 2019 Kitsune Ral <kitsune-ral@users.sf.net> | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| */ | ||
|
|
||
| #include "reactionevent.h" | ||
|
|
||
| using namespace QMatrixClient; | ||
|
|
||
| void QMatrixClient::JsonObjectConverter<EventRelation>::dumpTo( | ||
| QJsonObject& jo, const EventRelation& pod) | ||
| { | ||
| if (pod.type.isEmpty()) { | ||
| qCWarning(MAIN) << "Empty relation type; won't dump to JSON"; | ||
| return; | ||
| } | ||
| jo.insert(QStringLiteral("rel_type"), pod.type); | ||
| jo.insert(EventIdKey, pod.eventId); | ||
| if (pod.type == EventRelation::Annotation()) | ||
| jo.insert(QStringLiteral("key"), pod.key); | ||
| } | ||
|
|
||
| void QMatrixClient::JsonObjectConverter<EventRelation>::fillFrom( | ||
| const QJsonObject& jo, EventRelation& pod) | ||
| { | ||
| // The experimental logic for generic relationships (MSC1849) | ||
| fromJson(jo["rel_type"_ls], pod.type); | ||
| fromJson(jo[EventIdKeyL], pod.eventId); | ||
| if (pod.type == EventRelation::Annotation()) | ||
| fromJson(jo["key"_ls], pod.key); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /****************************************************************************** | ||
| * Copyright (C) 2019 Kitsune Ral <kitsune-ral@users.sf.net> | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "roomevent.h" | ||
|
|
||
| namespace QMatrixClient { | ||
|
|
||
| struct EventRelation | ||
| { | ||
| using reltypeid_t = const char*; | ||
| static constexpr reltypeid_t Reply() { return "m.in_reply_to"; } | ||
| static constexpr reltypeid_t Annotation() { return "m.annotation"; } | ||
| static constexpr reltypeid_t Replacement() { return "m.replace"; } | ||
|
|
||
| QString type; | ||
| QString eventId; | ||
| QString key = {}; // Only used for m.annotation for now | ||
|
|
||
| static EventRelation replyTo(QString eventId) | ||
| { | ||
| return { Reply(), std::move(eventId) }; | ||
| } | ||
| static EventRelation annotate(QString eventId, QString key) | ||
| { | ||
| return { Annotation(), std::move(eventId), std::move(key) }; | ||
| } | ||
| static EventRelation replace(QString eventId) | ||
| { | ||
| return { Replacement(), std::move(eventId) }; | ||
| } | ||
| }; | ||
| template <> | ||
| struct JsonObjectConverter<EventRelation> | ||
| { | ||
| static void dumpTo(QJsonObject& jo, const EventRelation& pod); | ||
| static void fillFrom(const QJsonObject& jo, EventRelation& pod); | ||
| }; | ||
|
|
||
| class ReactionEvent : public RoomEvent | ||
| { | ||
| public: | ||
| DEFINE_EVENT_TYPEID("m.reaction", ReactionEvent) | ||
|
|
||
| explicit ReactionEvent(const EventRelation& value) | ||
| : RoomEvent(typeId(), matrixTypeId(), | ||
| { { QStringLiteral("m.relates_to"), toJson(value) } }) | ||
| {} | ||
| explicit ReactionEvent(const QJsonObject& obj) | ||
| : RoomEvent(typeId(), obj) | ||
| {} | ||
| EventRelation relation() const | ||
| { | ||
| return content<EventRelation>(QStringLiteral("m.relates_to")); | ||
| } | ||
|
|
||
| private: | ||
| EventRelation _relation; | ||
| }; | ||
| REGISTER_EVENT_TYPE(ReactionEvent) | ||
|
|
||
| } // namespace QMatrixClient |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.