#include <QDataStream>
-Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, const QString &senderPrefixes, Flags flags)
+Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender,
+ const QString &senderPrefixes, const QString &realName, const QString &avatarUrl, Flags flags)
: _timestamp(QDateTime::currentDateTime().toUTC()),
_bufferInfo(bufferInfo),
_contents(contents),
_sender(sender),
_senderPrefixes(senderPrefixes),
+ _realName(realName),
+ _avatarUrl(avatarUrl),
_type(type),
_flags(flags)
{
}
-Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, const QString &senderPrefixes, Flags flags)
+Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents,
+ const QString &sender, const QString &senderPrefixes, const QString &realName,
+ const QString &avatarUrl, Flags flags)
: _timestamp(ts),
_bufferInfo(bufferInfo),
_contents(contents),
_sender(sender),
_senderPrefixes(senderPrefixes),
+ _realName(realName),
+ _avatarUrl(avatarUrl),
_type(type),
_flags(flags)
{
// 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::LongMessageTime)) {
- out << (quint64) msg.timestamp().toMSecsSinceEpoch();
+ 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();
}
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;
}
in >> msg._msgId;
- if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::LongMessageTime)) {
- quint64 timeStamp;
+ 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 {
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);
dbg.nospace() << qPrintable(QString("Message(MsgId:")) << msg.msgId()
<< 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.sender() << ":" << msg.contents();
+ << msg.senderPrefixes() << msg.sender() << ":" << msg.contents();
return dbg;
}