Add support for intentional mentions

lib/structs/events/messages/video.cpp

@@ -28,6 +28,7 @@ from_json(const json &obj, Video &content)
         content.file = obj.at("file").get<crypto::EncryptedFile>();
 
     content.relations = common::parse_relations(obj);
+    content.mentions  = common::parse_mentions(obj);
 }
 
 void
@@ -43,6 +44,7 @@ to_json(json &obj, const Video &content)
         obj["url"] = content.url;
 
     common::apply_relations(obj, content.relations);
+    common::add_mentions(obj, content.mentions);
 }
 
 } // namespace msg

tests/messages.cpp

@@ -587,6 +587,57 @@ TEST(RoomEvents, TextMessage)
     EXPECT_EQ(data.dump(), json(event).dump());
 }
 
+TEST(RoomEvents, TextMessageWithMention)
+{
+    json data = R"({
+          "origin_server_ts": 1510489356530,
+          "sender": "@nheko_test:matrix.org",
+          "event_id": "$15104893562785758wEgEU:matrix.org",
+          "unsigned": {
+            "age": 2225,
+            "transaction_id": "m1510489356267.2"
+          },
+          "content": {
+            "body": "hey there",
+            "msgtype": "m.text",
+	      "m.relates_to": {
+		  "m.in_reply_to": {
+                       "event_id": "$6GKhAfJOcwNd69lgSizdcTob8z2pWQgBOZPrnsWMA1E"
+                  }
+              },
+              "m.mentions": {
+                "room": true,
+                "user_ids": ["@alice:example.org"]
+              }
+          },
+          "type": "m.room.message",
+          "room_id": "!lfoDRlNFWlvOnvkBwQ:matrix.org"
+         })"_json;
+
+    RoomEvent<msg::Text> event = data.get<RoomEvent<msg::Text>>();
+
+    EXPECT_EQ(event.type, EventType::RoomMessage);
+    EXPECT_EQ(event.event_id, "$15104893562785758wEgEU:matrix.org");
+    EXPECT_EQ(event.room_id, "!lfoDRlNFWlvOnvkBwQ:matrix.org");
+    EXPECT_EQ(event.sender, "@nheko_test:matrix.org");
+    EXPECT_EQ(event.origin_server_ts, 1510489356530L);
+    EXPECT_EQ(event.unsigned_data.age, 2225);
+    EXPECT_EQ(event.unsigned_data.transaction_id, "m1510489356267.2");
+
+    EXPECT_EQ(event.content.body, "hey there");
+    EXPECT_EQ(event.content.msgtype, "m.text");
+    EXPECT_EQ(event.content.relations.relations.at(0).event_id,
+              "$6GKhAfJOcwNd69lgSizdcTob8z2pWQgBOZPrnsWMA1E");
+    EXPECT_EQ(event.content.relations.relations.at(0).rel_type,
+              mtx::common::RelationType::InReplyTo);
+
+    ASSERT_TRUE(event.content.mentions.has_value());
+    EXPECT_EQ(event.content.mentions->room, true);
+    EXPECT_EQ(event.content.mentions->user_ids, std::vector<std::string>{"@alice:example.org"});
+
+    EXPECT_EQ(data.dump(), json(event).dump());
+}
+
 TEST(RoomEvents, VideoMessage)
 {
     json data = R"({