Fix regressions from yesterday

include/mtx/events/encrypted.hpp

@@ -144,6 +144,8 @@ struct KeyRequest
 
         //! The user that send this event.
         std::string sender;
+        //! The type of the event.
+        mtx::events::EventType type;
 };
 
 void

lib/structs/events/encrypted.cpp

@@ -138,7 +138,7 @@ void
 from_json(const json &obj, KeyRequest &event)
 {
         event.sender               = obj.at("sender");
-
+        event.type                 = mtx::events::getEventType(obj.at("type").get<std::string>());
         event.request_id           = obj.at("content").at("request_id");
         event.requesting_device_id = obj.at("content").at("requesting_device_id");
 
@@ -160,7 +160,7 @@ to_json(json &obj, const KeyRequest &event)
         obj = json::object();
 
         obj["sender"]  = event.sender;
-
+        obj["type"]    = to_string(event.type);
         obj["content"] = json::object();
 
         obj["content"]["request_id"]           = event.request_id;

tests/events.cpp

@@ -962,7 +962,7 @@ TEST(ToDevice, KeyRequest)
 
         ns::msg::KeyRequest event = request_data;
         EXPECT_EQ(event.sender, "@mujx:matrix.org");
-        // EXPECT_EQ(event.type, mtx::events::EventType::RoomKeyRequest);
+        EXPECT_EQ(event.type, mtx::events::EventType::RoomKeyRequest);
         EXPECT_EQ(event.action, ns::msg::RequestAction::Request);
         EXPECT_EQ(event.algorithm, "m.megolm.v1.aes-sha2");
         EXPECT_EQ(event.room_id, "!iapLxlpZgOzqGnWkXR:matrix.org");
@@ -988,7 +988,7 @@ TEST(ToDevice, KeyCancellation)
 
         ns::msg::KeyRequest event = cancellation_data;
         EXPECT_EQ(event.sender, "@mujx:matrix.org");
-        // EXPECT_EQ(event.type, mtx::events::EventType::RoomKeyRequest);
+        EXPECT_EQ(event.type, mtx::events::EventType::RoomKeyRequest);
         EXPECT_EQ(event.action, ns::msg::RequestAction::Cancellation);
         EXPECT_EQ(event.request_id, "m1529936829480.0");
         EXPECT_EQ(event.requesting_device_id, "GGUBYESVPI");