/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2015 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
QString verboseMessage = tr("sending CTCP-%1 request to %2").arg(ctcpTag).arg(nick);
if (ctcpTag == "PING") {
- uint now = QDateTime::currentDateTime().toTime_t();
- message = QString::number(now);
+ message = QString::number(QDateTime::currentMSecsSinceEpoch());
}
// FIXME make this a proper event
return;
if (!Cipher::neededFeaturesAvailable()) {
- emit displayMsg(Message::Error, bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
return;
}
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
- if (parms.isEmpty() && !bufferInfo.bufferName().isEmpty())
+ if (parms.isEmpty() && !bufferInfo.bufferName().isEmpty() && bufferInfo.acceptsRegularMessages())
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
- emit displayMsg(Message::Info, bufname,
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname,
tr("[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."));
return;
}
QString target = parms.at(0);
if (network()->cipherKey(target).isEmpty()) {
- emit displayMsg(Message::Info, bufname, tr("No key has been set for %1.").arg(target));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("No key has been set for %1.").arg(target));
return;
}
network()->setCipherKey(target, QByteArray());
- emit displayMsg(Message::Info, bufname, tr("The key for %1 has been deleted.").arg(target));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("The key for %1 has been deleted.").arg(target));
#else
Q_UNUSED(msg)
- emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA2) library. "
"Contact your distributor about a Quassel package with QCA2 "
"support, or rebuild Quassel with QCA2 present."));
return;
if (!Cipher::neededFeaturesAvailable()) {
- emit displayMsg(Message::Error, bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
return;
}
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
- if (parms.count() == 0 && !bufferInfo.bufferName().isEmpty())
+ if (parms.count() == 0 && !bufferInfo.bufferName().isEmpty() && bufferInfo.acceptsRegularMessages())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 1) {
- emit displayMsg(Message::Info, bufname,
- tr("[usage] /keyx [<nick|channel>] Initiates a DH1080 key exchange with the target."));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname,
+ tr("[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."));
return;
}
QString target = parms.at(0);
+ if (network()->isChannelName(target)) {
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("It is only possible to exchange keys in a query buffer."));
+ return;
+ }
+
Cipher *cipher = network()->cipher(target);
if (!cipher) // happens when there is no CoreIrcChannel for the target
return;
QByteArray pubKey = cipher->initKeyExchange();
if (pubKey.isEmpty())
- emit displayMsg(Message::Error, bufname, tr("Failed to initiate key exchange with %1.").arg(target));
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Failed to initiate key exchange with %1.").arg(target));
else {
QList<QByteArray> params;
params << serverEncode(target) << serverEncode("DH1080_INIT ") + pubKey;
emit putCmd("NOTICE", params);
- emit displayMsg(Message::Info, bufname, tr("Initiated key exchange with %1.").arg(target));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("Initiated key exchange with %1.").arg(target));
}
#else
Q_UNUSED(msg)
- emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA) library. "
"Contact your distributor about a Quassel package with QCA "
"support, or rebuild Quassel with QCA present."));
void CoreUserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg)
{
- if (bufferInfo.bufferName().isEmpty()) return; // server buffer
+ 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);
QList<QByteArray> params;
params << serverEncode(bufferName) << channelEncode(bufferInfo.bufferName(), payload);
emit putCmd("NOTICE", params);
- emit displayMsg(Message::Notice, bufferName, payload, network()->myNick(), Message::Self);
+ emit displayMsg(Message::Notice, typeByTarget(bufferName), bufferName, payload, network()->myNick(), Message::Self);
}
void CoreUserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &msg)
{
- if (bufferInfo.bufferName().isEmpty())
+ if (bufferInfo.bufferName().isEmpty() || !bufferInfo.acceptsRegularMessages())
return; // server buffer
QByteArray encMsg = channelEncode(bufferInfo.bufferName(), msg);
return;
if (!Cipher::neededFeaturesAvailable()) {
- emit displayMsg(Message::Error, bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
return;
}
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
- if (parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
+ if (parms.count() == 1 && !bufferInfo.bufferName().isEmpty() && bufferInfo.acceptsRegularMessages())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 2) {
- emit displayMsg(Message::Info, bufname,
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname,
tr("[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. "
"/setkey <key> when in a channel or query buffer sets the key for it."));
return;
QByteArray key = parms.at(1).toLocal8Bit();
network()->setCipherKey(target, key);
- emit displayMsg(Message::Info, bufname, tr("The key for %1 has been set.").arg(target));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("The key for %1 has been set.").arg(target));
#else
Q_UNUSED(msg)
- emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA) library. "
"Contact your distributor about a Quassel package with QCA "
"support, or rebuild Quassel with QCA present."));
return;
if (!Cipher::neededFeaturesAvailable()) {
- emit displayMsg(Message::Error, bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: QCA provider plugin not found. It is usually provided by the qca-ossl plugin."));
return;
}
QStringList parms = msg.split(' ', QString::SkipEmptyParts);
- if (parms.isEmpty() && !bufferInfo.bufferName().isEmpty())
+ if (parms.isEmpty() && !bufferInfo.bufferName().isEmpty() && bufferInfo.acceptsRegularMessages())
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
- emit displayMsg(Message::Info, bufname, tr("[usage] /showkey <nick|channel> shows the encryption key for nick or channel or just /showkey when in a channel or query."));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("[usage] /showkey <nick|channel> shows the encryption key for nick or channel or just /showkey when in a channel or query."));
return;
}
QByteArray key = network()->cipherKey(target);
if (key.isEmpty()) {
- emit displayMsg(Message::Info, bufname, tr("No key has been set for %1.").arg(target));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("No key has been set for %1.").arg(target));
return;
}
- emit displayMsg(Message::Info, bufname, tr("The key for %1 is %2:%3").arg(target, network()->cipherUsesCBC(target) ? "CBC" : "ECB", QString(key)));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("The key for %1 is %2:%3").arg(target, network()->cipherUsesCBC(target) ? "CBC" : "ECB", QString(key)));
#else
Q_UNUSED(msg)
- emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, typeByTarget(bufname), bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA2) library. "
"Contact your distributor about a Quassel package with QCA2 "
"support, or rebuild Quassel with QCA2 present."));
void CoreUserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg)
{
- if (bufferInfo.bufferName().isEmpty())
+ if (bufferInfo.bufferName().isEmpty() || !bufferInfo.acceptsRegularMessages())
return;
QList<QByteArray> params;
// For example, blowfish-ebc seems to create 8-char chunks.
static const char *cmd = "PRIVMSG";
- static const char *splitter = " .,-";
+ static const char *splitter = " .,-!?";
int maxSplitPos = message.count();
int splitPos = maxSplitPos;
// that means that the last message can be as long as:
// 512 - nicklen - userlen - hostlen - commandlen - sum(param[0]..param[n-1])) - 2 (for CRLF) - 4 (":!@" + 1space between prefix and command) - max(paramcount - 1, 0) (space for simple params) - 2 (space and colon for last param)
IrcUser *me = network()->me();
- int maxLen = 480 - cmd.toAscii().count(); // educated guess in case we don't know us (yet?)
+ int maxLen = 480 - cmd.toLatin1().count(); // educated guess in case we don't know us (yet?)
if (me)
- maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6;
+ maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toLatin1().count() - 6;
if (!params.isEmpty()) {
for (int i = 0; i < params.count() - 1; i++) {
projects / quassel.git / blobdiff