From a53779d8ebb045e5bc5304f96120fa52d8612d44 Mon Sep 17 00:00:00 2001 From: Felix Rohrbach Date: Sat, 9 Apr 2016 04:56:22 +0200 Subject: Implement different types of messages --- events/roommessageevent.cpp | 104 +++++++++++++++++++++++++++++++++++++++----- events/roommessageevent.h | 75 +++++++++++++++++++++++++++++++- 2 files changed, 168 insertions(+), 11 deletions(-) diff --git a/events/roommessageevent.cpp b/events/roommessageevent.cpp index ea03986b..baaa9140 100644 --- a/events/roommessageevent.cpp +++ b/events/roommessageevent.cpp @@ -30,16 +30,16 @@ class RoomMessageEvent::Private Private() {} QString userId; - QString body; - QString msgtype; + MessageEventType msgtype; QDateTime hsob_ts; + MessageEventContent* content; }; RoomMessageEvent::RoomMessageEvent() : Event(EventType::RoomMessage) , d(new Private) { - + d->content = 0; } RoomMessageEvent::~RoomMessageEvent() @@ -52,14 +52,14 @@ QString RoomMessageEvent::userId() const return d->userId; } -QString RoomMessageEvent::msgtype() const +MessageEventType RoomMessageEvent::msgtype() const { return d->msgtype; } QString RoomMessageEvent::body() const { - return d->body; + return d->content->body; } QDateTime RoomMessageEvent::hsob_ts() const @@ -80,15 +80,99 @@ RoomMessageEvent* RoomMessageEvent::fromJson(const QJsonObject& obj) if( obj.contains("content") ) { QJsonObject content = obj.value("content").toObject(); - if( content.contains("msgtype") ) + QString msgtype = content.value("msgtype").toString(); + + if( msgtype == "m.text" ) { - e->d->msgtype = content.value("msgtype").toString(); - } else { - qDebug() << "RoomMessageEvent: msgtype not found"; + e->d->msgtype = MessageEventType::Text; + e->d->content = new MessageEventContent(); + } + else if( msgtype == "m.emote" ) + { + e->d->msgtype = MessageEventType::Emote; + e->d->content = new MessageEventContent(); + } + else if( msgtype == "m.notice" ) + { + e->d->msgtype = MessageEventType::Notice; + e->d->content = new MessageEventContent(); + } + else if( msgtype == "m.image" ) + { + e->d->msgtype = MessageEventType::Image; + ImageEventContent* c = new ImageEventContent; + c->url = QUrl(content.value("url").toString()); + QJsonObject info = content.value("info").toObject(); + c->height = info.value("h").toInt(); + c->width = info.value("w").toInt(); + c->size = info.value("size").toInt(); + c->mimetype = info.value("mimetype").toString(); + e->d->content = c; + } + else if( msgtype == "m.file" ) + { + e->d->msgtype = MessageEventType::File; + FileEventContent* c = new FileEventContent; + c->filename = content.value("filename").toString(); + c->url = QUrl(content.value("url").toString()); + QJsonObject info = content.value("info").toObject(); + c->size = info.value("size").toInt(); + c->mimetype = info.value("mimetype").toString(); + e->d->content = c; + } + else if( msgtype == "m.location" ) + { + e->d->msgtype = MessageEventType::Location; + LocationEventContent* c = new LocationEventContent; + c->geoUri = content.value("geo_uri").toString(); + c->thumbnailUrl = QUrl(content.value("thumbnail_url").toString()); + QJsonObject info = content.value("thumbnail_info").toObject(); + c->thumbnailHeight = info.value("h").toInt(); + c->thumbnailWidth = info.value("w").toInt(); + c->thumbnailSize = info.value("size").toInt(); + c->thumbnailMimetype = info.value("mimetype").toString(); + e->d->content = c; + } + else if( msgtype == "m.video" ) + { + e->d->msgtype = MessageEventType::Video; + VideoEventContent* c = new VideoEventContent; + c->url = QUrl(content.value("url").toString()); + QJsonObject info = content.value("info").toObject(); + c->height = info.value("h").toInt(); + c->width = info.value("w").toInt(); + c->duration = info.value("duration").toInt(); + c->size = info.value("size").toInt(); + c->thumbnailUrl = QUrl(info.value("thumnail_url").toString()); + QJsonObject thumbnailInfo = content.value("thumbnail_info").toObject(); + c->thumbnailHeight = thumbnailInfo.value("h").toInt(); + c->thumbnailWidth = thumbnailInfo.value("w").toInt(); + c->thumbnailSize = thumbnailInfo.value("size").toInt(); + c->thumbnailMimetype = thumbnailInfo.value("mimetype").toString(); + e->d->content = c; } + else if( msgtype == "m.audio" ) + { + e->d->msgtype = MessageEventType::Audio; + AudioEventContent* c = new AudioEventContent; + c->url = QUrl(content.value("url").toString()); + QJsonObject info = content.value("info").toObject(); + c->duration = info.value("duration").toInt(); + c->mimetype = info.value("mimetype").toString(); + c->size = info.value("size").toInt(); + e->d->content = c; + } + else + { + qDebug() << "RoomMessageEvent: unknown msgtype: " << msgtype; + qDebug() << obj; + e->d->msgtype = MessageEventType::Unkown; + e->d->content = new MessageEventContent; + } + if( content.contains("body") ) { - e->d->body = content.value("body").toString(); + e->d->content->body = content.value("body").toString(); } else { qDebug() << "RoomMessageEvent: body not found"; } diff --git a/events/roommessageevent.h b/events/roommessageevent.h index dcc5b547..939113d1 100644 --- a/events/roommessageevent.h +++ b/events/roommessageevent.h @@ -19,10 +19,25 @@ #ifndef QMATRIXCLIENT_ROOMMESSAGEEVENT_H #define QMATRIXCLIENT_ROOMMESSAGEEVENT_H +#include + #include "event.h" namespace QMatrixClient { + enum class MessageEventType + { + Text, Emote, Notice, Image, File, Location, Video, Audio, Unkown + }; + + class MessageEventContent + { + public: + virtual ~MessageEventContent() {} + + QString body; + }; + class RoomMessageEvent: public Event { public: @@ -30,9 +45,11 @@ namespace QMatrixClient virtual ~RoomMessageEvent(); QString userId() const; - QString msgtype() const; + MessageEventType msgtype() const; QString body() const; QDateTime hsob_ts() const; + + MessageEventContent* content() const; static RoomMessageEvent* fromJson( const QJsonObject& obj ); @@ -40,6 +57,62 @@ namespace QMatrixClient class Private; Private* d; }; + + class ImageEventContent: public MessageEventContent + { + public: + QUrl url; + int height; + int width; + int size; + QString mimetype; + }; + + class FileEventContent: public MessageEventContent + { + public: + QString filename; + QString mimetype; + int size; + QUrl url; + }; + + class LocationEventContent: public MessageEventContent + { + public: + QString geoUri; + int thumbnailHeight; + int thumbnailWidth; + QString thumbnailMimetype; + int thumbnailSize; + QUrl thumbnailUrl; + }; + + class VideoEventContent: public MessageEventContent + { + public: + QUrl url; + int duration; + int width; + int height; + int size; + QString mimetype; + int thumbnailWidth; + int thumbnailHeight; + int thumbnailSize; + QString thumbnailMimetype; + QUrl thumbnailUrl; + }; + + class AudioEventContent: public MessageEventContent + { + public: + QUrl url; + int size; + int duration; + QString mimetype; + }; + } #endif // QMATRIXCLIENT_ROOMMESSAGEEVENT_H \ No newline at end of file -- cgit v1.2.3