From c73b1c431514188449768d5c6e04dd55254bf13e Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 8 Apr 2016 07:49:54 +0900 Subject: Use class instead of struct to remove warning Originally by Felix Rohrbach (kde@fxrh.de) --- events/roomnameevent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'events') diff --git a/events/roomnameevent.cpp b/events/roomnameevent.cpp index f4c31edf..c5bcf011 100644 --- a/events/roomnameevent.cpp +++ b/events/roomnameevent.cpp @@ -20,8 +20,9 @@ using namespace QMatrixClient; -struct RoomNameEvent::Private +class RoomNameEvent::Private { +public: QString name; }; -- cgit v1.2.3 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(-) (limited to 'events') 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 From e074be6a42d4fbc9fd76566365f3ef148a8e7bdd Mon Sep 17 00:00:00 2001 From: Felix Rohrbach Date: Mon, 11 Apr 2016 02:18:45 +0200 Subject: Missing method in the last commit --- events/roommessageevent.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'events') diff --git a/events/roommessageevent.cpp b/events/roommessageevent.cpp index baaa9140..99d17e5c 100644 --- a/events/roommessageevent.cpp +++ b/events/roommessageevent.cpp @@ -67,6 +67,11 @@ QDateTime RoomMessageEvent::hsob_ts() const return d->hsob_ts; } +MessageEventContent* RoomMessageEvent::content() const +{ + return d->content; +} + RoomMessageEvent* RoomMessageEvent::fromJson(const QJsonObject& obj) { RoomMessageEvent* e = new RoomMessageEvent(); @@ -182,4 +187,4 @@ RoomMessageEvent* RoomMessageEvent::fromJson(const QJsonObject& obj) // } } return e; -} \ No newline at end of file +} -- cgit v1.2.3 From 48e7e8108a62fe990972256143b8d71180312c8b Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 11 Apr 2016 10:46:33 +0900 Subject: Use a more telling log line than !!!! --- events/roomaliasesevent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'events') diff --git a/events/roomaliasesevent.cpp b/events/roomaliasesevent.cpp index 6bbe0aff..54fb5682 100644 --- a/events/roomaliasesevent.cpp +++ b/events/roomaliasesevent.cpp @@ -64,7 +64,7 @@ QStringList RoomAliasesEvent::aliases() const RoomAliasesEvent* RoomAliasesEvent::fromJson(const QJsonObject& obj) { - qDebug() << "!!!!"; + qDebug() << "RoomAliasesEvent::fromJson"; RoomAliasesEvent* e = new RoomAliasesEvent(); e->parseJson(obj); const QJsonObject contents = obj.value("content").toObject(); -- cgit v1.2.3 From def5a08b4d360f6035ad4c420f0206ad6f96e0bd Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 11 Apr 2016 12:43:32 +0900 Subject: Factor out the code that searches an insertion point in a timeline. This is used once in the library and, I guess, twice more in the Quaternion. Implemented as a template function that is equally suitable for Event and Message, and any container that supports STL-style iterators (QList and other Qt containers do). --- events/event.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'events') diff --git a/events/event.h b/events/event.h index b25b1378..6a8d0e89 100644 --- a/events/event.h +++ b/events/event.h @@ -19,6 +19,8 @@ #ifndef QMATRIXCLIENT_EVENT_H #define QMATRIXCLIENT_EVENT_H +#include + #include #include #include @@ -53,6 +55,22 @@ namespace QMatrixClient class Private; Private* d; }; + + /** + * Finds a place in the timeline where a new event/message could be inserted. + * @return an iterator to an item with the earliest timestamp after + * the one of 'item'; or timeline.end(), if all events are earlier + */ + template class ContT> + typename ContT::iterator + findInsertionPos(ContT & timeline, const ItemT *item) + { + return std::lower_bound (timeline.begin(), timeline.end(), item, + [](const ItemT * a, const ItemT * b) { + return a->timestamp() < b->timestamp(); + } + ); + } } #endif // QMATRIXCLIENT_EVENT_H -- cgit v1.2.3