X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=1367b40cc9e9f4e26016e16f081744a82ae4a8cb;hp=7adedef58db685bc3dba3255aae016f4376592e5;hb=edc55b1f86cf613a332eeeb5d85537a54120dfa5;hpb=de1613db2dd9623aa650f7217eb718381bb642e3 diff --git a/src/common/message.cpp b/src/common/message.cpp index 7adedef5..1367b40c 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-2019 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,160 +15,154 @@ * 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 + #include -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(); -} +#include "message.h" +#include "peer.h" +#include "signalproxy.h" +#include "util.h" -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(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) +{} + +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(); + + 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(); -MsgId Message::msgId() const { - return _msgId; -} + if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::SenderPrefixes)) + out << msg.senderPrefixes().toUtf8(); -void Message::setMsgId(MsgId _id) { - _msgId = _id; -} + if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::RichMessages)) { + out << msg.realName().toUtf8(); + out << msg.avatarUrl().toUtf8(); + } -BufferId Message::buffer() const { - return _buffer; + out << msg.contents().toUtf8(); + return out; } -QString Message::text() const { - return _text; -} +QDataStream& operator>>(QDataStream& in, Message& msg) +{ + Q_ASSERT(SignalProxy::current()); + Q_ASSERT(SignalProxy::current()->sourcePeer()); -QString Message::sender() const { - return _sender; -} + in >> msg._msgId; -Message::Type Message::type() const { - return _type; -} + 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); + } -quint8 Message::flags() const { - return _flags; -} + quint32 type; + in >> type; + msg._type = Message::Type(type); -QDateTime Message::timeStamp() const { - return _timeStamp; -} + quint8 flags; + in >> flags; + msg._flags = Message::Flags(flags); -QString Message::mircToInternal(QString mirc) { - mirc.replace('%', "%%"); // escape % just to be sure - mirc.replace('\x02', "%B"); - mirc.replace('\x03', "%C"); - mirc.replace('\x0f', "%O"); - mirc.replace('\x12', "%R"); - mirc.replace('\x16', "%R"); - mirc.replace('\x1d', "%S"); - mirc.replace('\x1f', "%U"); - return mirc; -} + in >> msg._bufferInfo; -void Message::format() { - if(!_formattedText.isNull()) return; // already done - QString user = userFromMask(sender()); - QString host = hostFromMask(sender()); - QString nick = nickFromMask(sender()); - QString txt = mircToInternal(text()); - QString networkName = buffer().network(); - QString bufferName = buffer().buffer(); - - _formattedTimeStamp = tr("%DT[%1]").arg(timeStamp().toLocalTime().toString("hh:mm:ss")); - - QString s, t; - switch(type()) { - case Message::Plain: - s = tr("%DS<%1>").arg(nick); t = tr("%D0%1").arg(txt); break; - case Message::Server: - s = tr("%Ds*"); t = tr("%Ds%1").arg(txt); break; - case Message::Error: - s = tr("%De*"); t = tr("%De%1").arg(txt); break; - case Message::Join: - s = tr("%Dj-->"); t = tr("%Dj%DN%DU%1%DU%DN %DH(%2@%3)%DH has joined %DC%DU%4%DU%DC").arg(nick, user, host, bufferName); break; - case Message::Part: - s = tr("%Dp<--"); t = tr("%Dp%DN%DU%1%DU%DN %DH(%2@%3)%DH has left %DC%DU%4%DU%DC").arg(nick, user, host, bufferName); - if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); - break; - case Message::Quit: - s = tr("%Dq<--"); t = tr("%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit").arg(nick, user, host); - if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); - break; - case Message::Kick: - { s = tr("%Dk<-*"); - QString victim = txt.section(" ", 0, 0); - //if(victim == ui.ownNick->currentText()) victim = tr("you"); - QString kickmsg = txt.section(" ", 1); - t = tr("%Dk%DN%DU%1%DU%DN has kicked %DN%DU%2%DU%DN from %DC%DU%3%DU%DC").arg(nick).arg(victim).arg(bufferName); - if(!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg); - } - break; - case Message::Nick: - s = tr("%Dr<->"); - if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(text()); - else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, text()); - break; - case Message::Mode: - s = tr("%Dm***"); - if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(text()); - else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(text(), nick); - break; - case Message::Action: - s = tr("%Da-*-"); - t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(text()); - break; - default: - s = tr("%De%1").arg(sender()); - t = tr("%De[%1]").arg(text()); - } - _formattedSender = s; - _formattedText = t; -} + QByteArray sender; + in >> sender; + msg._sender = QString::fromUtf8(sender); -QString Message::formattedTimeStamp() { - format(); - return _formattedTimeStamp; -} + QByteArray senderPrefixes; + if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::SenderPrefixes)) + in >> senderPrefixes; + msg._senderPrefixes = QString::fromUtf8(senderPrefixes); -QString Message::formattedSender() { - format(); - return _formattedSender; -} + 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); -QString Message::formattedText() { - format(); - return _formattedText; -} + QByteArray contents; + in >> contents; + msg._contents = QString::fromUtf8(contents); -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; + return in; } -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; +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; } -