/***************************************************************************
- * 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 *
* 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 <QDataStream>
-/*
-Message Message::plain(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Plain, _text, _sender, _flags);
-}
+#include "util.h"
+#include "peer.h"
+#include "signalproxy.h"
-Message Message::notice(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Notice, _text, _sender, _flags);
+#include <QDataStream>
+#include <utility>
+
+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::action(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Action, _text, _sender, _flags);
-}
-Message Message::kick(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Kick, _text, _sender, _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::join(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Join, _text, _sender, _flags);
-}
-Message Message::part(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Part, _text, _sender, _flags);
-}
+QDataStream &operator<<(QDataStream &out, const Message &msg)
+{
+ Q_ASSERT(SignalProxy::current());
+ Q_ASSERT(SignalProxy::current()->targetPeer());
-Message Message::nick(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Nick, _text, _sender, _flags);
-}
+ // We do not serialize the sender prefixes until we have a new protocol or client-features implemented
+ out << msg.msgId();
-Message Message::mode(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Mode, _text, _sender, _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();
+ }
-Message Message::quit(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Quit, _text, _sender, _flags);
-}
+ out << (quint32) msg.type()
+ << (quint8) msg.flags()
+ << msg.bufferInfo()
+ << msg.sender().toUtf8();
-Message Message::kill(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Kill, _text, _sender, _flags);
-}
+ if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::SenderPrefixes))
+ out << msg.senderPrefixes().toUtf8();
-Message Message::server(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Server, _text, _sender, _flags);
-}
+ if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::RichMessages)) {
+ out << msg.realName().toUtf8();
+ out << msg.avatarUrl().toUtf8();
+ }
-Message Message::info(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Info, _text, _sender, _flags);
+ out << msg.contents().toUtf8();
+ return out;
}
-Message Message::error(QString _target, QString _text, QString _sender, quint8 _flags) {
- return Message(_target, Error, _text, _sender, _flags);
-}
-*/
-
-QDataStream &operator<<(QDataStream &out, const Message &msg) {
- /*
- out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
- << msg.target.toUtf8() << msg.sender.toUtf8() << msg.text.toUtf8();
- */
- out << (quint32)msg.timeStamp.toTime_t() << (quint8)msg.type << (quint8)msg.flags
- << msg.buffer << msg.sender.toUtf8() << msg.text.toUtf8();
- return out;
-}
-QDataStream &operator>>(QDataStream &in, Message &msg) {
- quint8 t, f;
- quint32 ts;
- QByteArray s, m, targ;
- BufferId buf;
- in >> ts >> t >> f >> buf >> s >> m;
- msg.type = (Message::Type)t;
- msg.flags = (quint8)f;
- msg.timeStamp = QDateTime::fromTime_t(ts);
- //msg.target = QString::fromUtf8(targ);
- msg.sender = QString::fromUtf8(s);
- msg.text = QString::fromUtf8(m);
- return in;
+QDataStream &operator>>(QDataStream &in, Message &msg)
+{
+ 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)
+{
+ 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.senderPrefixes() << msg.sender() << ":" << msg.contents();
+ return dbg;
+}
projects / quassel.git / blobdiff