From: Alexander von Renteln Date: Thu, 24 Jan 2008 15:26:31 +0000 (+0000) Subject: Added commands: who, whois and whowas. X-Git-Tag: 0.2.0-alpha1~198 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=44a3dfc31a3461f3a507df324cd9397253c92eb3;ds=sidebyside Added commands: who, whois and whowas. --- diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp index d34a2788..90e508eb 100644 --- a/src/core/userinputhandler.cpp +++ b/src/core/userinputhandler.cpp @@ -92,6 +92,13 @@ void UserInputHandler::handleList(QString bufname, QString msg) { emit putCmd("LIST", msg.split(' ', QString::SkipEmptyParts)); } + +void UserInputHandler::handleMe(QString bufname, QString msg) { + if(bufname.isEmpty()) return; // server buffer + server->ctcpHandler()->query(bufname, "ACTION", msg); + emit displayMsg(Message::Action, bufname, msg, network()->myNick()); +} + void UserInputHandler::handleMode(QString bufname, QString msg) { emit putCmd("MODE", msg.split(' ', QString::SkipEmptyParts)); } @@ -127,7 +134,10 @@ void UserInputHandler::handlePart(QString bufname, QString msg) { // TODO: implement queries void UserInputHandler::handleQuery(QString bufname, QString msg) { - QString nick = msg.section(' ', 0, 0); + // QString nick = msg.section(' ', 0, 0); + + handleMsg(bufname, msg); + // TODO: usenetworkids // if(!nick.isEmpty()) // emit queryRequested(network, nick); @@ -141,6 +151,7 @@ void UserInputHandler::handleQuote(QString bufname, QString msg) { emit putRawLine(msg); } + void UserInputHandler::handleSay(QString bufname, QString msg) { if(bufname.isEmpty()) return; // server buffer QStringList params; @@ -153,11 +164,6 @@ void UserInputHandler::handleSay(QString bufname, QString msg) { } } -void UserInputHandler::handleMe(QString bufname, QString msg) { - if(bufname.isEmpty()) return; // server buffer - server->ctcpHandler()->query(bufname, "ACTION", msg); - emit displayMsg(Message::Action, bufname, msg, network()->myNick()); -} void UserInputHandler::handleTopic(QString bufname, QString msg) { if(bufname.isEmpty()) return; @@ -175,9 +181,22 @@ void UserInputHandler::handleVoice(QString bufname, QString msg) { } +void UserInputHandler::handleWho(QString bufname, QString msg) { + emit putCmd("WHO", QStringList(msg)); +} + + +void UserInputHandler::handleWhois(QString bufname, QString msg) { + emit putCmd("WHOIS", QStringList(msg)); +} + + +void UserInputHandler::handleWhowas(QString bufname, QString msg) { + emit putCmd("WHOWAS", QStringList(msg)); +} + void UserInputHandler::defaultHandler(QString cmd, QString bufname, QString msg) { emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg)); - } diff --git a/src/core/userinputhandler.h b/src/core/userinputhandler.h index 66b0fea2..a365894c 100644 --- a/src/core/userinputhandler.h +++ b/src/core/userinputhandler.h @@ -41,6 +41,7 @@ public slots: void handleJoin(QString, QString); void handleKick(QString, QString); void handleList(QString, QString); + void handleMe(QString, QString); void handleMode(QString, QString); void handleMsg(QString, QString); void handleNick(QString, QString); @@ -52,10 +53,11 @@ public slots: void handleSay(QString, QString); void handleTopic(QString, QString); void handleVoice(QString, QString); - void handleMe(QString, QString); + void handleWho(QString, QString); + void handleWhois(QString, QString); + void handleWhowas(QString, QString); void defaultHandler(QString cmd, QString buf, QString msg); - };