X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.cpp;h=cac1ff2434efd1e2a0c966cff6cbb61471d54320;hp=53f4c2e0f80fbab36a7fa75d60cc89992790f04d;hb=3260afbf85dff47d1dc83293f8147889c90d4699;hpb=04315f46a16fc3627218377071e008b6b9744992 diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp index 53f4c2e0..cac1ff24 100644 --- a/src/core/coreuserinputhandler.cpp +++ b/src/core/coreuserinputhandler.cpp @@ -181,6 +181,7 @@ void CoreUserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QStrin void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QString &msg) { + QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName(); #ifdef HAVE_QCA2 if (!bufferInfo.isValid()) return; @@ -194,7 +195,7 @@ void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QStr parms.prepend(bufferInfo.bufferName()); if (parms.isEmpty()) { - emit displayMsg(Message::Info, bufferInfo.bufferName(), "", + emit displayMsg(Message::Info, bufname, tr("[usage] /delkey deletes the encryption key for nick or channel or just /delkey when in a channel or query.")); return; } @@ -202,50 +203,78 @@ void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QStr QString target = parms.at(0); if (network()->cipherKey(target).isEmpty()) { - emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("No key has been set for %1.").arg(target)); + emit displayMsg(Message::Info, bufname, tr("No key has been set for %1.").arg(target)); return; } network()->setCipherKey(target, QByteArray()); - emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 has been deleted.").arg(target)); + emit displayMsg(Message::Info, bufname, tr("The key for %1 has been deleted.").arg(target)); #else Q_UNUSED(msg) - emit displayMsg(Message::Error, bufferInfo.bufferName(), "", tr("Error: Setting an encryption key requires Quassel to have been built " + emit displayMsg(Message::Error, 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.")); #endif } +void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& addOrRemove, const QChar& mode, const QString &nicks) +{ + QString m; + bool isNumber; + int maxModes = network()->support("MODES").toInt(&isNumber); + if (!isNumber || maxModes == 0) maxModes = 1; + + QStringList nickList; + if (nicks == "*") { // All users in channel + const QList users = network()->ircChannel(bufferInfo.bufferName())->ircUsers(); + foreach(IrcUser *user, users) { + if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode)) + || (addOrRemove == '-' && network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))) + nickList.append(user->nick()); + } + } else { + nickList = nicks.split(' ', QString::SkipEmptyParts); + } + + if (nickList.count() == 0) return; + + while (!nickList.isEmpty()) { + int amount = qMin(nickList.count(), maxModes); + QString m = addOrRemove; for(int i = 0; i < amount; i++) m += mode; + QStringList params; + params << bufferInfo.bufferName() << m; + for(int i = 0; i < amount; i++) params << nickList.takeFirst(); + emit putCmd("MODE", serverEncode(params)); + } +} + -void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &msg) +void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &nicks) { - QStringList nicks = msg.split(' ', QString::SkipEmptyParts); - QString m = "-"; for (int i = 0; i < nicks.count(); i++) m += 'o'; - QStringList params; - params << bufferInfo.bufferName() << m << nicks; - emit putCmd("MODE", serverEncode(params)); + doMode(bufferInfo, '-', 'o', nicks); } -void CoreUserInputHandler::handleDehalfop(const BufferInfo &bufferInfo, const QString &msg) +void CoreUserInputHandler::handleDehalfop(const BufferInfo &bufferInfo, const QString &nicks) { - QStringList nicks = msg.split(' ', QString::SkipEmptyParts); - QString m = "-"; for (int i = 0; i < nicks.count(); i++) m += 'h'; - QStringList params; - params << bufferInfo.bufferName() << m << nicks; - emit putCmd("MODE", serverEncode(params)); + doMode(bufferInfo, '-', 'h', nicks); } -void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg) +void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &nicks) { - QStringList nicks = msg.split(' ', QString::SkipEmptyParts); - QString m = "-"; for (int i = 0; i < nicks.count(); i++) m += 'v'; - QStringList params; - params << bufferInfo.bufferName() << m << nicks; - emit putCmd("MODE", serverEncode(params)); + doMode(bufferInfo, '-', 'v', nicks); +} + +void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &nicks) +{ + doMode(bufferInfo, '+', 'h', nicks); +} + +void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &nicks) { + doMode(bufferInfo, '+', 'o', nicks); } @@ -321,6 +350,7 @@ void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStrin void CoreUserInputHandler::handleKeyx(const BufferInfo &bufferInfo, const QString &msg) { + QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName(); #ifdef HAVE_QCA2 if (!bufferInfo.isValid()) return; @@ -333,7 +363,7 @@ void CoreUserInputHandler::handleKeyx(const BufferInfo &bufferInfo, const QStrin if (parms.count() == 0 && !bufferInfo.bufferName().isEmpty()) parms.prepend(bufferInfo.bufferName()); else if (parms.count() != 1) { - emit displayMsg(Message::Info, bufferInfo.bufferName(), + emit displayMsg(Message::Info, bufname, tr("[usage] /keyx [] Initiates a DH1080 key exchange with the target.")); return; } @@ -346,16 +376,16 @@ void CoreUserInputHandler::handleKeyx(const BufferInfo &bufferInfo, const QStrin QByteArray pubKey = cipher->initKeyExchange(); if (pubKey.isEmpty()) - emit displayMsg(Message::Error, bufferInfo.bufferName(), tr("Failed to initiate key exchange with %1.").arg(target)); + emit displayMsg(Message::Error, bufname, tr("Failed to initiate key exchange with %1.").arg(target)); else { QList params; params << serverEncode(target) << serverEncode("DH1080_INIT ") + pubKey; emit putCmd("NOTICE", params); - emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("Initiated key exchange with %1.").arg(target)); + emit displayMsg(Message::Info, bufname, tr("Initiated key exchange with %1.").arg(target)); } #else Q_UNUSED(msg) - emit displayMsg(Message::Error, bufferInfo.bufferName(), tr("Error: Setting an encryption key requires Quassel to have been built " + emit displayMsg(Message::Error, 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.")); @@ -463,25 +493,6 @@ void CoreUserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QStr } -void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &msg) -{ - QStringList nicks = msg.split(' ', QString::SkipEmptyParts); - QString m = "+"; for (int i = 0; i < nicks.count(); i++) m += 'h'; - QStringList params; - params << bufferInfo.bufferName() << m << nicks; - emit putCmd("MODE", serverEncode(params)); -} - - -void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) -{ - QStringList nicks = msg.split(' ', QString::SkipEmptyParts); - QString m = "+"; for (int i = 0; i < nicks.count(); i++) m += 'o'; - QStringList params; - params << bufferInfo.bufferName() << m << nicks; - emit putCmd("MODE", serverEncode(params)); -} - void CoreUserInputHandler::handleOper(const BufferInfo &bufferInfo, const QString &msg) { @@ -576,6 +587,7 @@ void CoreUserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QString &msg) { + QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName(); #ifdef HAVE_QCA2 if (!bufferInfo.isValid()) return; @@ -588,7 +600,7 @@ void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QStr if (parms.count() == 1 && !bufferInfo.bufferName().isEmpty()) parms.prepend(bufferInfo.bufferName()); else if (parms.count() != 2) { - emit displayMsg(Message::Info, bufferInfo.bufferName(), + emit displayMsg(Message::Info, bufname, tr("[usage] /setkey sets the encryption key for nick or channel. " "/setkey when in a channel or query buffer sets the key for it.")); return; @@ -598,10 +610,10 @@ void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QStr QByteArray key = parms.at(1).toLocal8Bit(); network()->setCipherKey(target, key); - emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 has been set.").arg(target)); + emit displayMsg(Message::Info, bufname, tr("The key for %1 has been set.").arg(target)); #else Q_UNUSED(msg) - emit displayMsg(Message::Error, bufferInfo.bufferName(), tr("Error: Setting an encryption key requires Quassel to have been built " + emit displayMsg(Message::Error, 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.")); @@ -611,6 +623,7 @@ void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QStr void CoreUserInputHandler::handleShowkey(const BufferInfo &bufferInfo, const QString &msg) { + QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName(); #ifdef HAVE_QCA2 if (!bufferInfo.isValid()) return; @@ -624,8 +637,7 @@ void CoreUserInputHandler::handleShowkey(const BufferInfo &bufferInfo, const QSt parms.prepend(bufferInfo.bufferName()); if (parms.isEmpty()) { - emit displayMsg(Message::Info, bufferInfo.bufferName(), "", - tr("[usage] /showkey shows the encryption key for nick or channel or just /showkey when in a channel or query.")); + emit displayMsg(Message::Info, bufname, tr("[usage] /showkey shows the encryption key for nick or channel or just /showkey when in a channel or query.")); return; } @@ -633,15 +645,15 @@ void CoreUserInputHandler::handleShowkey(const BufferInfo &bufferInfo, const QSt QByteArray key = network()->cipherKey(target); if (key.isEmpty()) { - emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("No key has been set for %1.").arg(target)); + emit displayMsg(Message::Info, bufname, tr("No key has been set for %1.").arg(target)); return; } - emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 is %2").arg(target).arg(QString(key))); + emit displayMsg(Message::Info, bufname, tr("The key for %1 is %2").arg(target).arg(QString(key))); #else Q_UNUSED(msg) - emit displayMsg(Message::Error, bufferInfo.bufferName(), "", tr("Error: Setting an encryption key requires Quassel to have been built " + emit displayMsg(Message::Error, 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."));