X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=1367b40cc9e9f4e26016e16f081744a82ae4a8cb;hp=2c0157664e3b4e36ebe92ae36354e9c8d56e3bd4;hb=edc55b1f86cf613a332eeeb5d85537a54120dfa5;hpb=921e54680da16fcf2adb7a90506875aceb6633a4

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 2c015766..1367b40c 100644
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,66 +18,151 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "message.h"
+#include <utility>
+
+#include <QDataStream>
 
+#include "message.h"
+#include "peer.h"
+#include "signalproxy.h"
 #include "util.h"
 
-#include <QDataStream>
+Message::Message(BufferInfo bufferInfo,
+                 Type type,
+                 QString contents,
+                 QString sender,
+                 QString senderPrefixes,
+                 QString realName,
+                 QString avatarUrl,
+                 Flags flags)
+    : _timestamp(QDateTime::currentDateTime().toUTC())
+    , _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)
+{}
+
+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)
+{}
 
-Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
-    : _timestamp(QDateTime::currentDateTime().toUTC()),
-    _bufferInfo(bufferInfo),
-    _contents(contents),
-    _sender(sender),
-    _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();
 
-Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
-    : _timestamp(ts),
-    _bufferInfo(bufferInfo),
-    _contents(contents),
-    _sender(sender),
-    _type(type),
-    _flags(flags)
-{
-}
+    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();
 
-QDataStream &operator<<(QDataStream &out, const Message &msg)
-{
-    out << msg.msgId() << (quint32)msg.timestamp().toTime_t() << (quint32)msg.type() << (quint8)msg.flags()
-    << msg.bufferInfo() << msg.sender().toUtf8() << msg.contents().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;
 }
 
-
-QDataStream &operator>>(QDataStream &in, Message &msg)
+QDataStream& operator>>(QDataStream& in, Message& msg)
 {
-    quint8 f;
-    quint32 t;
-    quint32 ts;
-    QByteArray s, m;
-    BufferInfo buf;
-    in >> msg._msgId >> ts >> t >> f >> buf >> s >> m;
-    msg._type = (Message::Type)t;
-    msg._flags = (Message::Flags)f;
-    msg._bufferInfo = buf;
-    msg._timestamp = QDateTime::fromTime_t(ts);
-    msg._sender = QString::fromUtf8(s);
-    msg._contents = QString::fromUtf8(m);
+    Q_ASSERT(SignalProxy::current());
+    Q_ASSERT(SignalProxy::current()->sourcePeer());
+
+    in >> msg._msgId;
+
+    if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::LongTime)) {
+        // timestamp is a qint64, signed rather than unsigned
+        qint64 timeStamp;
+        in >> timeStamp;
+        msg._timestamp = QDateTime::fromMSecsSinceEpoch(timeStamp);
+    }
+    else {
+        quint32 timeStamp;
+        in >> timeStamp;
+        msg._timestamp = QDateTime::fromTime_t(timeStamp);
+    }
+
+    quint32 type;
+    in >> type;
+    msg._type = Message::Type(type);
+
+    quint8 flags;
+    in >> flags;
+    msg._flags = Message::Flags(flags);
+
+    in >> msg._bufferInfo;
+
+    QByteArray sender;
+    in >> sender;
+    msg._sender = QString::fromUtf8(sender);
+
+    QByteArray senderPrefixes;
+    if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::SenderPrefixes))
+        in >> senderPrefixes;
+    msg._senderPrefixes = QString::fromUtf8(senderPrefixes);
+
+    QByteArray realName;
+    QByteArray avatarUrl;
+    if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::RichMessages)) {
+        in >> realName;
+        in >> avatarUrl;
+    }
+    msg._realName = QString::fromUtf8(realName);
+    msg._avatarUrl = QString::fromUtf8(avatarUrl);
+
+    QByteArray contents;
+    in >> contents;
+    msg._contents = QString::fromUtf8(contents);
+
     return in;
 }
 
-
-QDebug operator<<(QDebug dbg, const Message &msg)
+QDebug operator<<(QDebug dbg, const Message& msg)
 {
     dbg.nospace() << qPrintable(QString("Message(MsgId:")) << msg.msgId()
-    << qPrintable(QString(",")) << msg.timestamp()
-    << qPrintable(QString(", Type:")) << msg.type()
-    << qPrintable(QString(", Flags:")) << msg.flags() << qPrintable(QString(")"))
-    << msg.sender() << ":" << msg.contents();
+                  << qPrintable(QString(",")) << msg.timestamp()
+                  << qPrintable(QString(", Type:")) << msg.type()
+                  << qPrintable(QString(", RealName:")) << msg.realName()
+                  << qPrintable(QString(", AvatarURL:")) << msg.avatarUrl()
+                  << qPrintable(QString(", Flags:")) << msg.flags()
+                  << qPrintable(QString(")"))
+                  << msg.senderPrefixes() << msg.sender() << ":"
+                  << msg.contents();
     return dbg;
 }