X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=ea348005adb3d79063bcfd26bdb9a943a30e66b9;hp=5d4705e0f07fbe3a2b30542f6d9d071825d737b7;hb=d357030175ec6ca1152d51393da6e178b967a5e5;hpb=902c95728306e5ba115de84800fc8d5d239c9d62 diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp index 5d4705e0..ea348005 100644 --- a/src/core/userinputhandler.cpp +++ b/src/core/userinputhandler.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -21,13 +21,13 @@ #include "util.h" -#include "server.h" -#include "networkinfo.h" +#include "networkconnection.h" +#include "network.h" #include "ctcphandler.h" #include -UserInputHandler::UserInputHandler(Server *parent) +UserInputHandler::UserInputHandler(NetworkConnection *parent) : BasicHandler(parent) { } @@ -53,9 +53,37 @@ void UserInputHandler::handleUserInput(QString bufname, QString msg) { // ==================== void UserInputHandler::handleAway(QString bufname, QString msg) { + Q_UNUSED(bufname) emit putCmd("AWAY", QStringList(msg)); } +void UserInputHandler::handleBan(QString bufname, QString msg) { + if(!isChannelName(bufname)) + return; + + //TODO: find suitable default hostmask if msg gives only nickname + // Example: MODE &oulu +b *!*@* + QStringList banMsg(bufname+" +b "+msg); + emit putCmd("MODE", banMsg); +} + +void UserInputHandler::handleCtcp(QString bufname, QString msg) { + Q_UNUSED(bufname) + QString nick = msg.section(' ', 0, 0); + QString ctcpTag = msg.section(' ', 1, 1).toUpper(); + if (ctcpTag.isEmpty()) return; + QString message = ""; + QString verboseMessage = tr("sending CTCP-%1-request").arg(ctcpTag); + + if(ctcpTag == "PING") { + uint now = QDateTime::currentDateTime().toTime_t(); + message = QString::number(now); + } + + server->ctcpHandler()->query(nick, ctcpTag, message); + emit displayMsg(Message::Action, "", verboseMessage, network()->myNick()); +} + void UserInputHandler::handleDeop(QString bufname, QString msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'o'; @@ -78,8 +106,18 @@ void UserInputHandler::handleInvite(QString bufname, QString msg) { emit putCmd("INVITE", params); } +void UserInputHandler::handleJ(QString bufname, QString msg) { + Q_UNUSED(bufname) + QStringList params = msg.split(" "); + if(params.size() > 0 && !params[0].startsWith("#")) { + params[0] = QString("#%1").arg(params[0]); + } + emit putCmd("JOIN", params); +} + void UserInputHandler::handleJoin(QString bufname, QString msg) { - emit putCmd("JOIN", QStringList(msg)); + Q_UNUSED(bufname) + emit putCmd("JOIN", msg.split(" ")); } void UserInputHandler::handleKick(QString bufname, QString msg) { @@ -89,24 +127,37 @@ void UserInputHandler::handleKick(QString bufname, QString msg) { } void UserInputHandler::handleList(QString bufname, QString msg) { + Q_UNUSED(bufname) 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) { + Q_UNUSED(bufname) emit putCmd("MODE", msg.split(' ', QString::SkipEmptyParts)); } // TODO: show privmsgs void UserInputHandler::handleMsg(QString bufname, QString msg) { - QString nick = msg.section(" ", 0, 0); - msg = msg.section(" ", 1); - if(nick.isEmpty() || msg.isEmpty()) return; + Q_UNUSED(bufname) + if(!msg.contains(' ')) + return; + QStringList params; - params << nick << msg; + params << msg.section(' ', 0, 0); + params << msg.section(' ', 1); + emit putCmd("PRIVMSG", params); } void UserInputHandler::handleNick(QString bufname, QString msg) { + Q_UNUSED(bufname) QString nick = msg.section(' ', 0, 0); emit putCmd("NICK", QStringList(nick)); } @@ -127,17 +178,23 @@ void UserInputHandler::handlePart(QString bufname, QString msg) { // TODO: implement queries void UserInputHandler::handleQuery(QString bufname, QString msg) { - QString nick = msg.section(' ', 0, 0); - // TODO: usenetworkids -// if(!nick.isEmpty()) -// emit queryRequested(network, nick); + Q_UNUSED(bufname) + QString target = msg.section(' ', 0, 0); + QString message = msg.section(' ', 1); + if(message.isEmpty()) + emit displayMsg(Message::Server, target, "Starting query with " + target, network()->myNick(), Message::Self); + else + emit displayMsg(Message::Plain, target, message, network()->myNick(), Message::Self); + handleMsg(bufname, msg); } void UserInputHandler::handleQuit(QString bufname, QString msg) { + Q_UNUSED(bufname) emit putCmd("QUIT", QStringList(msg)); } void UserInputHandler::handleQuote(QString bufname, QString msg) { + Q_UNUSED(bufname) emit putRawLine(msg); } @@ -146,17 +203,7 @@ void UserInputHandler::handleSay(QString bufname, QString msg) { QStringList params; params << bufname << msg; emit putCmd("PRIVMSG", params); - if(isChannelName(bufname)) { - emit displayMsg(Message::Plain, params[0], msg, networkInfo()->myNick(), Message::Self); - } else { - emit displayMsg(Message::Plain, params[0], msg, networkInfo()->myNick(), Message::Self|Message::PrivMsg); - } -} - -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, networkInfo()->myNick()); + emit displayMsg(Message::Plain, params[0], msg, network()->myNick(), Message::Self); } void UserInputHandler::handleTopic(QString bufname, QString msg) { @@ -174,10 +221,24 @@ void UserInputHandler::handleVoice(QString bufname, QString msg) { emit putCmd("MODE", params); } +void UserInputHandler::handleWho(QString bufname, QString msg) { + Q_UNUSED(bufname) + emit putCmd("WHO", msg.split(' ')); +} + +void UserInputHandler::handleWhois(QString bufname, QString msg) { + Q_UNUSED(bufname) + emit putCmd("WHOIS", msg.split(' ')); +} + +void UserInputHandler::handleWhowas(QString bufname, QString msg) { + Q_UNUSED(bufname) + emit putCmd("WHOWAS", msg.split(' ')); +} void UserInputHandler::defaultHandler(QString cmd, QString bufname, QString msg) { + Q_UNUSED(bufname) emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg)); - }