-QDataStream &operator>>(QDataStream &in, Message &msg) {
- quint8 t, f;
- quint32 ts;
- QByteArray s, m;
- BufferId buf;
- in >> ts >> t >> f >> buf >> s >> m;
- msg.type = (Message::Type)t;
- msg.flags = (quint8)f;
- msg.buffer = buf;
- msg.timeStamp = QDateTime::fromTime_t(ts);
- msg.sender = QString::fromUtf8(s);
- msg.text = QString::fromUtf8(m);
- return in;
+
+Message::Message(QDateTime ts, BufferInfo bufferInfo, Type type, QString contents,
+ QString sender, QString senderPrefixes, QString realName,
+ QString avatarUrl, Flags flags)
+ : _timestamp(std::move(ts)),
+ _bufferInfo(std::move(bufferInfo)),
+ _contents(std::move(contents)),
+ _sender(std::move(sender)),
+ _senderPrefixes(std::move(senderPrefixes)),
+ _realName(std::move(realName)),
+ _avatarUrl(std::move(avatarUrl)),
+ _type(type),
+ _flags(flags)
+{
+}
+
+
+QDataStream &operator<<(QDataStream &out, const Message &msg)
+{
+ Q_ASSERT(SignalProxy::current());
+ Q_ASSERT(SignalProxy::current()->targetPeer());
+
+ // We do not serialize the sender prefixes until we have a new protocol or client-features implemented
+ out << msg.msgId();
+
+ if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::LongTime)) {
+ // toMSecs returns a qint64, signed rather than unsigned
+ out << (qint64) msg.timestamp().toMSecsSinceEpoch();
+ } else {
+ out << (quint32) msg.timestamp().toTime_t();
+ }
+
+ out << (quint32) msg.type()
+ << (quint8) msg.flags()
+ << msg.bufferInfo()
+ << msg.sender().toUtf8();
+
+ if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::SenderPrefixes))
+ out << msg.senderPrefixes().toUtf8();
+
+ if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::RichMessages)) {
+ out << msg.realName().toUtf8();
+ out << msg.avatarUrl().toUtf8();
+ }
+
+ out << msg.contents().toUtf8();
+ return out;