/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "message.h"
#include "util.h"
+#include "peer.h"
+#include "signalproxy.h"
#include <QDataStream>
-Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
- : _timestamp(QDateTime::currentDateTime().toUTC()),
+Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, const QString &senderPrefixes, Flags flags)
+ : _timestamp(QDateTime::currentDateTime().toUTC()),
_bufferInfo(bufferInfo),
_contents(contents),
_sender(sender),
+ _senderPrefixes(senderPrefixes),
_type(type),
_flags(flags)
{
}
-Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags)
- : _timestamp(ts),
+
+Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, const QString &senderPrefixes, Flags flags)
+ : _timestamp(ts),
_bufferInfo(bufferInfo),
_contents(contents),
_sender(sender),
+ _senderPrefixes(senderPrefixes),
_type(type),
_flags(flags)
{
}
-void Message::setFlags(Flags flags) {
- _flags = flags;
-}
-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();
- return out;
+QDataStream &operator<<(QDataStream &out, const Message &msg)
+{
+ // We do not serialize the sender prefixes until we have a new protocol or client-features implemented
+ out << msg.msgId()
+ << (quint32) msg.timestamp().toTime_t()
+ << (quint32) msg.type()
+ << (quint8) msg.flags()
+ << msg.bufferInfo()
+ << msg.sender().toUtf8();
+
+ if (SignalProxy::current()->targetPeer()->features().testFlag(Quassel::Feature::SenderPrefixes))
+ out << msg.senderPrefixes().toUtf8();
+
+ out << msg.contents().toUtf8();
+ return out;
}
-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);
- return in;
+
+QDataStream &operator>>(QDataStream &in, Message &msg)
+{
+ in >> msg._msgId;
+
+ 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()->features().testFlag(Quassel::Feature::SenderPrefixes))
+ in >> senderPrefixes;
+ msg._senderPrefixes = QString::fromUtf8(senderPrefixes);
+
+ QByteArray contents;
+ in >> contents;
+ msg._contents = QString::fromUtf8(contents);
+
+ return in;
}
+
+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();
+ return dbg;
+}