X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=873458f26bd6b460fb113ebc32634fccaf021d17;hb=88ce73ff525535c00cc979fff357fbe4cb8cdc2b;hp=9875473a57b0db60910da53cad1ce20e92858375;hpb=2ee32e7f7707349d12c98181bbe6842f6d19f60e;p=quassel.git

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 9875473a..873458f2 100644
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,73 +15,100 @@
  *   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(BufferId __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
-  : _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _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(QDateTime __ts, BufferId __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
-  : _timeStamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _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)
+    : _timestamp(ts),
+    _bufferInfo(bufferInfo),
+    _contents(contents),
+    _sender(sender),
+    _senderPrefixes(senderPrefixes),
+    _type(type),
+    _flags(flags)
+{
 }
 
-MsgId Message::msgId() const {
-  return _msgId;
-}
 
-void Message::setMsgId(MsgId _id) {
-  _msgId = _id;
-}
+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();
 
-BufferId Message::buffer() const {
-  return _buffer;
-}
+    if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::SenderPrefixes))
+        out << msg.senderPrefixes().toUtf8();
 
-QString Message::text() const {
-  return _text;
+    out << msg.contents().toUtf8();
+    return out;
 }
 
-QString Message::sender() const {
-  return _sender;
-}
 
-Message::Type Message::type() const {
-   return _type;
-}
+QDataStream &operator>>(QDataStream &in, Message &msg)
+{
+    in >> msg._msgId;
 
-quint8 Message::flags() const {
-   return _flags;
-}
+    quint32 timeStamp;
+    in >> timeStamp;
+    msg._timestamp = QDateTime::fromTime_t(timeStamp);
 
-QDateTime Message::timeStamp() const {
-  return _timeStamp;
-}
+    quint32 type;
+    in >> type;
+    msg._type = Message::Type(type);
 
+    quint8 flags;
+    in >> flags;
+    msg._flags = Message::Flags(flags);
 
-QDataStream &operator<<(QDataStream &out, const Message &msg) {
-  out << (quint32)msg.timeStamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
-      << msg.buffer() << msg.sender().toUtf8() << msg.text().toUtf8();
-  return out;
-}
+    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);
 
-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;
+    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;
+}