Add RoomEvent

include/events/RoomEvent.h

@@ -0,0 +1,94 @@
+/*
+ * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MATRIX_ROOM_EVENT_H
+#define MATRIX_ROOM_EVENT_H
+
+#include <QJsonValue>
+#include <QString>
+
+#include "Event.h"
+
+template <class Content>
+class RoomEvent : public Event<Content>
+{
+public:
+	inline QString eventId() const;
+	inline QString roomId() const;
+	inline QString sender() const;
+	inline uint64_t timestamp() const;
+
+	void deserialize(const QJsonValue &data) override;
+
+private:
+	QString event_id_;
+	QString room_id_;
+	QString sender_;
+
+	uint64_t origin_server_ts_;
+};
+
+template <class Content>
+inline QString RoomEvent<Content>::eventId() const
+{
+	return event_id_;
+}
+
+template <class Content>
+inline QString RoomEvent<Content>::roomId() const
+{
+	return room_id_;
+}
+
+template <class Content>
+inline QString RoomEvent<Content>::sender() const
+{
+	return sender_;
+}
+
+template <class Content>
+inline uint64_t RoomEvent<Content>::timestamp() const
+{
+	return origin_server_ts_;
+}
+
+template <class Content>
+void RoomEvent<Content>::deserialize(const QJsonValue &data)
+{
+	Event<Content>::deserialize(data);
+
+	auto object = data.toObject();
+
+	if (!object.contains("event_id"))
+		throw DeserializationException("event_id key is missing");
+
+	if (!object.contains("origin_server_ts"))
+		throw DeserializationException("origin_server_ts key is missing");
+
+	if (!object.contains("room_id"))
+		throw DeserializationException("room_id key is missing");
+
+	if (!object.contains("sender"))
+		throw DeserializationException("sender key is missing");
+
+	event_id_ = object.value("event_id").toString();
+	room_id_ = object.value("room_id").toString();
+	sender_ = object.value("sender").toString();
+	origin_server_ts_ = object.value("origin_server_ts").toDouble();
+}
+
+#endif  // MATRIX_ROOM_EVENT_H

tests/events.cc

@@ -2,6 +2,7 @@
 #include <QJsonArray>
 
 #include "Event.h"
+#include "RoomEvent.h"
 
 #include "AliasesEventContent.h"
 #include "AvatarEventContent.h"
@@ -71,6 +72,61 @@ TEST(BaseEvent, Deserialization)
 	EXPECT_EQ(join_rules_event.content().joinRule(), JoinRule::Private);
 }
 
+TEST(BaseEvent, DeserializationException)
+{
+	auto data = QJsonObject{
+		{"content", QJsonObject{{"rule", "private"}}},
+		{"type", "m.room.join_rules"}};
+
+	Event<JoinRulesEventContent> event1;
+	ASSERT_THROW(event1.deserialize(data), DeserializationException);
+
+	data = QJsonObject{
+		{"contents", QJsonObject{{"join_rule", "private"}}},
+		{"type", "m.room.join_rules"}};
+
+	Event<JoinRulesEventContent> event2;
+	ASSERT_THROW(event2.deserialize(data), DeserializationException);
+}
+
+TEST(RoomEvent, Deserialization)
+{
+	auto data = QJsonObject{
+		{"content", QJsonObject{{"name", "Name"}}},
+		{"event_id", "$asdfafdf8af:matrix.org"},
+		{"room_id", "!aasdfaeae23r9:matrix.org"},
+		{"sender", "@alice:matrix.org"},
+		{"origin_server_ts", 1323238293289323LL},
+		{"type", "m.room.name"}};
+
+	RoomEvent<NameEventContent> event;
+	event.deserialize(data);
+
+	EXPECT_EQ(event.eventId(), "$asdfafdf8af:matrix.org");
+	EXPECT_EQ(event.roomId(), "!aasdfaeae23r9:matrix.org");
+	EXPECT_EQ(event.sender(), "@alice:matrix.org");
+	EXPECT_EQ(event.timestamp(), 1323238293289323);
+	EXPECT_EQ(event.content().name(), "Name");
+}
+
+TEST(RoomEvent, DeserializationException)
+{
+	auto data = QJsonObject{
+		{"content", QJsonObject{{"name", "Name"}}},
+		{"event_id", "$asdfafdf8af:matrix.org"},
+		{"room_id", "!aasdfaeae23r9:matrix.org"},
+		{"origin_server_ts", 1323238293289323LL},
+		{"type", "m.room.name"}};
+
+	RoomEvent<NameEventContent> event;
+
+	try {
+		event.deserialize(data);
+	} catch (const DeserializationException &e) {
+		ASSERT_STREQ("sender key is missing", e.what());
+	}
+}
+
 TEST(EventType, Mapping)
 {
 	EXPECT_EQ(extractEventType(QJsonObject{{"type", "m.room.aliases"}}), EventType::RoomAliases);
@@ -83,6 +139,7 @@ TEST(EventType, Mapping)
 	EXPECT_EQ(extractEventType(QJsonObject{{"type", "m.room.name"}}), EventType::RoomName);
 	EXPECT_EQ(extractEventType(QJsonObject{{"type", "m.room.power_levels"}}), EventType::RoomPowerLevels);
 	EXPECT_EQ(extractEventType(QJsonObject{{"type", "m.room.topic"}}), EventType::RoomTopic);
+	EXPECT_EQ(extractEventType(QJsonObject{{"type", "m.room.unknown"}}), EventType::Unsupported);
 }
 
 TEST(AliasesEventContent, Deserialization)