diff options
Diffstat (limited to 'events')
| -rw-r--r-- | events/event.cpp | 27 | ||||
| -rw-r--r-- | events/roommessageevent.cpp | 20 |
2 files changed, 23 insertions, 24 deletions
diff --git a/events/event.cpp b/events/event.cpp index 07649b02..5df816fe 100644 --- a/events/event.cpp +++ b/events/event.cpp @@ -87,27 +87,26 @@ QString Event::originalJson() const return d->originalJson; } -template <typename T> -Event* make(const QJsonObject& obj) +template <typename EventT> +EventT* make(const QJsonObject& obj) { - return T::fromJson(obj); + return EventT::fromJson(obj); } Event* Event::fromJson(const QJsonObject& obj) { - auto delegate = lookup(obj.value("type").toString(), - "m.room.message", make<RoomMessageEvent>, - "m.room.name", make<RoomNameEvent>, - "m.room.aliases", make<RoomAliasesEvent>, - "m.room.canonical_alias", make<RoomCanonicalAliasEvent>, - "m.room.member", make<RoomMemberEvent>, - "m.room.topic", make<RoomTopicEvent>, - "m.typing", make<TypingEvent>, - "m.receipt", make<ReceiptEvent>, + return dispatch<Event*>(obj).to(obj["type"].toString(), + "m.room.message", &make<RoomMessageEvent>, + "m.room.name", &make<RoomNameEvent>, + "m.room.aliases", &make<RoomAliasesEvent>, + "m.room.canonical_alias", &make<RoomCanonicalAliasEvent>, + "m.room.member", &make<RoomMemberEvent>, + "m.room.topic", &make<RoomTopicEvent>, + "m.typing", &make<TypingEvent>, + "m.receipt", &make<ReceiptEvent>, /* Insert new event types BEFORE this line */ - make<UnknownEvent> + &make<UnknownEvent> ); - return delegate(obj); } bool Event::parseJson(const QJsonObject& obj) diff --git a/events/roommessageevent.cpp b/events/roommessageevent.cpp index 677bb79f..d5e960a1 100644 --- a/events/roommessageevent.cpp +++ b/events/roommessageevent.cpp @@ -120,17 +120,17 @@ RoomMessageEvent* RoomMessageEvent::fromJson(const QJsonObject& obj) { e->d->plainBody = content["body"].toString(); - auto delegate = lookup(content.value("msgtype").toString(), - "m.text", make<MessageEventType::Text, TextContent>, - "m.emote", make<MessageEventType::Emote, TextContent>, - "m.notice", make<MessageEventType::Notice, TextContent>, - "m.image", make<MessageEventType::Image, ImageContent>, - "m.file", make<MessageEventType::File, FileContent>, - "m.location", make<MessageEventType::Location, LocationContent>, - "m.video", makeVideo, - "m.audio", make<MessageEventType::Audio, AudioContent>, + auto delegate = lookup(content["msgtype"].toString(), + "m.text", &make<MessageEventType::Text, TextContent>, + "m.emote", &make<MessageEventType::Emote, TextContent>, + "m.notice", &make<MessageEventType::Notice, TextContent>, + "m.image", &make<MessageEventType::Image, ImageContent>, + "m.file", &make<MessageEventType::File, FileContent>, + "m.location", &make<MessageEventType::Location, LocationContent>, + "m.video", &makeVideo, + "m.audio", &make<MessageEventType::Audio, AudioContent>, // Insert new message types before this line - makeUnknown + &makeUnknown ); std::tie(e->d->msgtype, e->d->content) = delegate(content); } |