# include "cipher.h"
#endif
+#if QT_VERSION < 0x050000
+// QChar::LineFeed is Qt 5
+static const QChar QCharLF = QChar('\n');
+#else
+static const QChar QCharLF = QChar::LineFeed;
+#endif
+
CoreUserInputHandler::CoreUserInputHandler(CoreNetwork *parent)
: CoreBasicHandler(parent)
{
// ====================
// Public Slots
// ====================
-void CoreUserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg)
+void CoreUserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg,
+ const bool skipFormatting)
{
Q_UNUSED(bufferInfo)
if (msg.startsWith("-all")) {
if (msg.length() == 4) {
- coreSession()->globalAway();
+ coreSession()->globalAway(QString(), skipFormatting);
return;
}
Q_ASSERT(msg.length() > 4);
if (msg[4] == ' ') {
- coreSession()->globalAway(msg.mid(5));
+ coreSession()->globalAway(msg.mid(5), skipFormatting);
return;
}
}
- issueAway(msg);
+ issueAway(msg, true /* force away */, skipFormatting);
}
-void CoreUserInputHandler::issueAway(const QString &msg, bool autoCheck)
+void CoreUserInputHandler::issueAway(const QString &msg, bool autoCheck, const bool skipFormatting)
{
QString awayMsg = msg;
IrcUser *me = network()->me();
+ // Only apply timestamp formatting when requested
+ // This avoids re-processing any existing away message when the core restarts, so chained escape
+ // percent signs won't get down-processed.
+ if (!skipFormatting) {
+ // Apply the timestamp formatting to the away message (if empty, nothing will happen)
+ awayMsg = formatCurrentDateTimeInString(awayMsg);
+ }
+
// if there is no message supplied we have to check if we are already away or not
if (autoCheck && msg.isEmpty()) {
if (me && !me->isAway()) {
Identity *identity = network()->identityPtr();
if (identity) {
- awayMsg = identity->awayReason();
+ awayMsg = formatCurrentDateTimeInString(identity->awayReason());
}
if (awayMsg.isEmpty()) {
awayMsg = tr("away");
// FIXME make this a proper event
coreNetwork()->coreSession()->ctcpParser()->query(coreNetwork(), nick, ctcpTag, message);
- emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick());
+ emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage,
+ network()->myNick(), Message::Flag::Self);
}
if (bufferInfo.bufferName().isEmpty() || !bufferInfo.acceptsRegularMessages())
return; // server buffer
// FIXME make this a proper event
- coreNetwork()->coreSession()->ctcpParser()->query(coreNetwork(), bufferInfo.bufferName(), "ACTION", msg);
- emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
+
+ // Split apart messages at line feeds. The IRC protocol uses those to separate commands, so
+ // they need to be split into multiple messages.
+ QStringList messages = msg.split(QCharLF);
+
+ foreach (auto message, messages) {
+ // Handle each separated message independently, ignoring any carriage returns
+ message = message.trimmed();
+ coreNetwork()->coreSession()->ctcpParser()->query(coreNetwork(), bufferInfo.bufferName(),
+ "ACTION", message);
+ emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), message,
+ network()->myNick(), Message::Self);
+ }
}
void CoreUserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QString &msg)
{
QString bufferName = msg.section(' ', 0, 0);
- QString payload = msg.section(' ', 1);
QList<QByteArray> params;
- params << serverEncode(bufferName) << channelEncode(bufferInfo.bufferName(), payload);
- emit putCmd("NOTICE", params);
- emit displayMsg(Message::Notice, typeByTarget(bufferName), bufferName, payload, network()->myNick(), Message::Self);
+ // Split apart messages at line feeds. The IRC protocol uses those to separate commands, so
+ // they need to be split into multiple messages.
+ QStringList messages = msg.section(' ', 1).split(QCharLF);
+
+ foreach (auto message, messages) {
+ // Handle each separated message independently, ignoring any carriage returns
+ message = message.trimmed();
+ params.clear();
+ params << serverEncode(bufferName) << channelEncode(bufferInfo.bufferName(), message);
+ emit putCmd("NOTICE", params);
+ emit displayMsg(Message::Notice, typeByTarget(bufferName), bufferName, message,
+ network()->myNick(), Message::Self);
+ }
}
{
Q_UNUSED(bufferInfo)
QString target = msg.section(' ', 0, 0);
- QString message = msg.section(' ', 1);
- if (message.isEmpty())
- emit displayMsg(Message::Server, BufferInfo::QueryBuffer, target, tr("Starting query with %1").arg(target), network()->myNick(), Message::Self);
- else
- emit displayMsg(Message::Plain, BufferInfo::QueryBuffer, target, message, network()->myNick(), Message::Self);
- handleMsg(bufferInfo, msg);
+ // Split apart messages at line feeds. The IRC protocol uses those to separate commands, so
+ // they need to be split into multiple messages.
+ QStringList messages = msg.section(' ', 1).split(QCharLF);
+
+ foreach (auto message, messages) {
+ // Handle each separated message independently, ignoring any carriage returns
+ message = message.trimmed();
+ if (message.isEmpty()) {
+ emit displayMsg(Message::Server, BufferInfo::QueryBuffer, target,
+ tr("Starting query with %1").arg(target), network()->myNick(),
+ Message::Self);
+ // handleMsg is a no-op if message is empty
+ } else {
+ emit displayMsg(Message::Plain, BufferInfo::QueryBuffer, target, message,
+ network()->myNick(), Message::Self);
+ // handleMsg needs the target specified at the beginning of the message
+ handleMsg(bufferInfo, target + " " + message);
+ }
+ }
}
return channelEncode(target, message);
};
+ // Split apart messages at line feeds. The IRC protocol uses those to separate commands, so
+ // they need to be split into multiple messages.
+ QStringList messages = msg.split(QCharLF);
+
+ foreach (auto message, messages) {
+ // Handle each separated message independently, ignoring any carriage returns
+ message = message.trimmed();
#ifdef HAVE_QCA2
- putPrivmsg(bufferInfo.bufferName(), msg, encodeFunc, network()->cipher(bufferInfo.bufferName()));
+ putPrivmsg(bufferInfo.bufferName(), message, encodeFunc,
+ network()->cipher(bufferInfo.bufferName()));
#else
- putPrivmsg(bufferInfo.bufferName(), msg, encodeFunc);
+ putPrivmsg(bufferInfo.bufferName(), message, encodeFunc);
#endif
- emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
+ emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), message,
+ network()->myNick(), Message::Self);
+ }
}
projects / quassel.git / blobdiff