X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessage.cpp;h=f1f7c48af8ca00eab4cdec12ef9609fa8c66b2eb;hp=e51cc6b161bd16fe3b787253e9075db8c8ae431b;hb=f824db0e31b54969e0b7fa0b5405b1e9173d482c;hpb=8699dd758516d0ded076811e8ea656adc95e69d0 diff --git a/src/common/message.cpp b/src/common/message.cpp index e51cc6b1..f1f7c48a 100644 --- a/src/common/message.cpp +++ b/src/common/message.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -24,192 +24,57 @@ #include -Message::Message(BufferInfo __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, Flags flags) + : _timestamp(QDateTime::currentDateTime().toUTC()), + _bufferInfo(bufferInfo), + _contents(contents), + _sender(sender), + _type(type), + _flags(flags) +{ } -Message::Message(QDateTime __ts, BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags) - : _timestamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) { - -} - -MsgId Message::msgId() const { - return _msgId; -} - -void Message::setMsgId(MsgId _id) { - _msgId = _id; -} - -BufferInfo Message::buffer() const { - return _buffer; -} - -QString Message::text() const { - return _text; -} - -QString Message::sender() const { - return _sender; -} - -Message::Type Message::type() const { - return _type; -} - -quint8 Message::flags() const { - return _flags; -} - -QDateTime Message::timestamp() const { - return _timestamp; +Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, Flags flags) + : _timestamp(ts), + _bufferInfo(bufferInfo), + _contents(contents), + _sender(sender), + _type(type), + _flags(flags) +{ } -QString Message::mircToInternal(QString mirc) { - mirc.replace('%', "%%"); // escape % just to be sure - mirc.replace('\x02', "%B"); - mirc.replace('\x0f', "%O"); - mirc.replace('\x12', "%R"); - mirc.replace('\x16', "%R"); - mirc.replace('\x1d', "%S"); - mirc.replace('\x1f', "%U"); - - // Now we bring the color codes (\x03) in a sane format that can be parsed more easily later. - // %Dcfxx is foreground, %Dcbxx is background color, where xx is a 2 digit dec number denoting the color code. - // %Dc- turns color off. - // Note: We use the "mirc standard" as described in . - // This means that we don't accept something like \x03,5 (even though others, like WeeChat, do). - int pos = 0; - for(;;) { - pos = mirc.indexOf('\x03', pos); - if(pos < 0) break; // no more mirc color codes - QString ins, num; - int l = mirc.length(); - int i = pos + 1; - // check for fg color - if(i < l && mirc[i].isDigit()) { - num = mirc[i++]; - if(i < l && mirc[i].isDigit()) num.append(mirc[i++]); - else num.prepend('0'); - ins = QString("%Dcf%1").arg(num); - - if(i+1 < l && mirc[i] == ',' && mirc[i+1].isDigit()) { - i++; - num = mirc[i++]; - if(i < l && mirc[i].isDigit()) num.append(mirc[i++]); - else num.prepend('0'); - ins += QString("%Dcb%1").arg(num); - } - } else { - ins = "%Dc-"; - } - mirc.replace(pos, i-pos, ins); - } - return mirc; +void Message::setFlags(Flags flags) { + _flags = flags; } -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(txt); - else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, txt); - 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(txt, nick); - break; - case Message::Action: - s = tr("%Da-*-"); - t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(txt); - break; - default: - s = tr("%De%1").arg(sender()); - t = tr("%De[%1]").arg(txt); - } - _formattedSender = s; - _formattedText = t; -} - -QString Message::formattedTimestamp() { - format(); - return _formattedTimestamp; -} - -QString Message::formattedSender() { - format(); - return _formattedSender; -} - -QString Message::formattedText() { - format(); - return _formattedText; -} - -/* -QString Message::formattedToHtml(const QString &f) { - - - return f; -} -*/ - 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(); + 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 &in, Message &msg) { - quint8 t, f; + quint8 f; + quint32 t; quint32 ts; QByteArray s, m; BufferInfo buf; - in >> ts >> t >> f >> buf >> s >> m; + in >> msg._msgId >> ts >> t >> f >> buf >> s >> m; msg._type = (Message::Type)t; - msg._flags = (quint8)f; - msg._buffer = buf; + msg._flags = (Message::Flags)f; + msg._bufferInfo = buf; msg._timestamp = QDateTime::fromTime_t(ts); msg._sender = QString::fromUtf8(s); - msg._text = QString::fromUtf8(m); + msg._contents = 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(", Flags:")) << msg.flags() << qPrintable(QString(")")) + << msg.sender() << ":" << msg.contents(); + return dbg; +}