summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ac654fd)
Incomprehensible code, which actually caused a segfault in most of the
few places it was used. The only useful part is calling typeByTarget,
but that can be done in the calling site just as well.
list << param;
emit putCmd(cmd, list, prefix);
}
list << param;
emit putCmd(cmd, list, prefix);
}
-
-
-void CoreBasicHandler::displayMsg(Message::Type msgType, QString target, const QString &text, const QString &sender, Message::Flags flags)
-{
- IrcChannel *channel = network()->ircChannel(target);
- if (!channel) {
- if (!target.isEmpty() && network()->prefixes().contains(target[0]))
- target = target.mid(1);
-
- if (target.startsWith('$') || target.startsWith('#'))
- target = nickFromMask(sender);
- }
-
- emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
-}
void putRawLine(const QByteArray &msg);
protected:
void putRawLine(const QByteArray &msg);
protected:
- void displayMsg(Message::Type, QString target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None);
void putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix = QByteArray());
inline CoreNetwork *network() const { return _network; }
void putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix = QByteArray());
inline CoreNetwork *network() const { return _network; }
return;
if (!Cipher::neededFeaturesAvailable()) {
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."));
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
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;
}
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()) {
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());
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));
- 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."));
"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()) {
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."));
if (parms.count() == 0 && !bufferInfo.bufferName().isEmpty())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 1) {
if (parms.count() == 0 && !bufferInfo.bufferName().isEmpty())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 1) {
- emit displayMsg(Message::Info, bufname,
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname,
tr("[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."));
return;
}
tr("[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."));
return;
}
QString target = parms.at(0);
if (network()->isChannelName(target)) {
QString target = parms.at(0);
if (network()->isChannelName(target)) {
- emit displayMsg(Message::Info, bufname, tr("It is only possible to exchange keys in a query buffer."));
+ emit displayMsg(Message::Info, typeByTarget(bufname), bufname, tr("It is only possible to exchange keys in a query buffer."));
QByteArray pubKey = cipher->initKeyExchange();
if (pubKey.isEmpty())
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);
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));
- 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."));
"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."));
QList<QByteArray> params;
params << serverEncode(bufferName) << channelEncode(bufferInfo.bufferName(), payload);
emit putCmd("NOTICE", params);
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);
return;
if (!Cipher::neededFeaturesAvailable()) {
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."));
if (parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 2) {
if (parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
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;
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);
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));
- 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."));
"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()) {
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."));
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
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."));
QByteArray key = network()->cipherKey(target);
if (key.isEmpty()) {
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));
- 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)));
- 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."));
"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."));