/***************************************************************************
- * 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 *
#include "util.h"
-#include "server.h"
-#include "networkinfo.h"
+#include "networkconnection.h"
+#include "network.h"
#include "ctcphandler.h"
#include <QDebug>
-UserInputHandler::UserInputHandler(Server *parent)
- : BasicHandler(parent) {
+UserInputHandler::UserInputHandler(NetworkConnection *parent) : BasicHandler(parent) {
}
-void UserInputHandler::handleUserInput(QString bufname, QString msg) {
+void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg_) {
try {
- if(msg.isEmpty())
+ if(msg_.isEmpty())
return;
QString cmd;
+ QString msg = msg_;
if(!msg.startsWith('/')) {
cmd = QString("SAY");
} else {
cmd = msg.section(' ', 0, 0).remove(0, 1).toUpper();
msg = msg.section(' ', 1);
}
- handle(cmd, Q_ARG(QString, bufname), Q_ARG(QString, msg));
+ handle(cmd, Q_ARG(BufferInfo, bufferInfo), Q_ARG(QString, msg));
} catch(Exception e) {
- emit displayMsg(Message::Error, "", e.msg());
+ emit displayMsg(Message::Error, bufferInfo.type(), "", e.msg());
}
}
// Public Slots
// ====================
-void UserInputHandler::handleAway(QString bufname, QString msg) {
- emit putCmd("AWAY", QStringList(msg));
+void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ putCmd("AWAY", serverEncode(msg));
}
-void UserInputHandler::handleDeop(QString bufname, QString msg) {
+void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) {
+ if(bufferInfo.type() != BufferInfo::ChannelBuffer)
+ return;
+
+ //TODO: find suitable default hostmask if msg gives only nickname
+ // Example: MODE &oulu +b *!*@*
+ QByteArray banMsg = serverEncode(bufferInfo.bufferName()) + " +b " + channelEncode(bufferInfo.bufferName(), msg);
+ emit putCmd("MODE", banMsg);
+}
+
+void UserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ 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);
+ }
+
+ networkConnection()->ctcpHandler()->query(nick, ctcpTag, message);
+ emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick());
+}
+
+void UserInputHandler::handleDeop(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 << bufname << m << nicks;
- emit putCmd("MODE", params);
+ params << bufferInfo.bufferName() << m << nicks;
+ emit putCmd("MODE", serverEncode(params));
}
-void UserInputHandler::handleDevoice(QString bufname, QString msg) {
+void UserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg) {
QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'v';
QStringList params;
- params << bufname << m << nicks;
- emit putCmd("MODE", params);
+ params << bufferInfo.bufferName() << m << nicks;
+ emit putCmd("MODE", serverEncode(params));
}
-void UserInputHandler::handleInvite(QString bufname, QString msg) {
+void UserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString &msg) {
QStringList params;
- params << msg << bufname;
- emit putCmd("INVITE", params);
+ params << msg << bufferInfo.bufferName();
+ emit putCmd("INVITE", serverEncode(params));
}
-void UserInputHandler::handleJoin(QString bufname, QString msg) {
- emit putCmd("JOIN", QStringList(msg));
+void UserInputHandler::handleJ(const BufferInfo &bufferInfo, const QString &msg) {
+ QString trimmed = msg.trimmed();
+ if(trimmed.length() == 0) return;
+ if(trimmed[0].isLetter()) trimmed.prepend("#");
+ handleJoin(bufferInfo, trimmed);
}
-void UserInputHandler::handleKick(QString bufname, QString msg) {
- QStringList params;
- params << bufname << msg.split(' ', QString::SkipEmptyParts);
+void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ QStringList params = msg.trimmed().split(" ");
+ QStringList chans = params[0].split(",");
+ QStringList keys;
+ if(params.count() > 1) keys = params[1].split(",");
+ emit putCmd("JOIN", serverEncode(params)); // FIXME handle messages longer than 512 bytes!
+ int i = 0;
+ for(; i < keys.count(); i++) {
+ if(i >= chans.count()) break;
+ networkConnection()->addChannelKey(chans[i], keys[i]);
+ }
+ for(; i < chans.count(); i++) {
+ networkConnection()->removeChannelKey(chans[i]);
+ }
+}
+
+void UserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) {
+ QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty);
+ QString reason = msg.section(' ', 1, -1, QString::SectionSkipEmpty).trimmed();
+ if(reason.isEmpty()) reason = networkConnection()->identity()->kickReason();
+ QList<QByteArray> params;
+ params << serverEncode(bufferInfo.bufferName()) << serverEncode(nick) << channelEncode(bufferInfo.bufferName(), reason);
emit putCmd("KICK", params);
}
-void UserInputHandler::handleList(QString bufname, QString msg) {
- emit putCmd("LIST", msg.split(' ', QString::SkipEmptyParts));
+void UserInputHandler::handleList(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ emit putCmd("LIST", serverEncode(msg.split(' ', QString::SkipEmptyParts)));
+}
+
+
+void UserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) {
+ if(bufferInfo.bufferName().isEmpty()) return; // server buffer
+ networkConnection()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", channelEncode(bufferInfo.bufferName(), msg));
+ emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick());
}
-void UserInputHandler::handleMode(QString bufname, QString msg) {
- emit putCmd("MODE", msg.split(' ', QString::SkipEmptyParts));
+void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ // TODO handle correct encoding for buffer modes (channelEncode())
+ emit putCmd("MODE", serverEncode(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;
- QStringList params;
- params << nick << msg;
+void UserInputHandler::handleMsg(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo);
+ if(!msg.contains(' '))
+ return;
+
+ QList<QByteArray> params;
+ params << serverEncode(msg.section(' ', 0, 0));
+ params << userEncode(params[0], msg.section(' ', 1));
+
emit putCmd("PRIVMSG", params);
}
-void UserInputHandler::handleNick(QString bufname, QString msg) {
+void UserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
QString nick = msg.section(' ', 0, 0);
- emit putCmd("NICK", QStringList(nick));
+ emit putCmd("NICK", serverEncode(nick));
}
-void UserInputHandler::handleOp(QString bufname, QString msg) {
+void UserInputHandler::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 << bufname << m << nicks;
- emit putCmd("MODE", params);
+ params << bufferInfo.bufferName() << m << nicks;
+ emit putCmd("MODE", serverEncode(params));
}
-void UserInputHandler::handlePart(QString bufname, QString msg) {
- QStringList params;
- params << bufname << msg;
+void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &msg) {
+ QList<QByteArray> params;
+ params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg);
emit putCmd("PART", params);
}
// 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);
+void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ QString target = msg.section(' ', 0, 0);
+ QString message = msg.section(' ', 1);
+ if(message.isEmpty())
+ emit displayMsg(Message::Server, BufferInfo::QueryBuffer, target, "Starting query with " + target, network()->myNick(), Message::Self);
+ else
+ emit displayMsg(Message::Plain, BufferInfo::QueryBuffer, target, message, network()->myNick(), Message::Self);
+ handleMsg(bufferInfo, msg);
}
-void UserInputHandler::handleQuit(QString bufname, QString msg) {
- emit putCmd("QUIT", QStringList(msg));
+void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ emit putCmd("QUIT", serverEncode(msg));
}
-void UserInputHandler::handleQuote(QString bufname, QString msg) {
- emit putRawLine(msg);
+void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ emit putRawLine(serverEncode(msg));
}
-void UserInputHandler::handleSay(QString bufname, QString msg) {
- if(bufname.isEmpty()) return; // server buffer
- QStringList params;
- params << bufname << msg;
+void UserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &msg) {
+ if(bufferInfo.bufferName().isEmpty()) return; // server buffer
+ QList<QByteArray> params;
+ params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), 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);
- }
+ emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
}
-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());
-}
-
-void UserInputHandler::handleTopic(QString bufname, QString msg) {
- if(bufname.isEmpty()) return;
- QStringList params;
- params << bufname << msg;
+void UserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) {
+ if(bufferInfo.bufferName().isEmpty()) return;
+ QList<QByteArray> params;
+ params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg);
emit putCmd("TOPIC", params);
}
-void UserInputHandler::handleVoice(QString bufname, QString msg) {
+void UserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString &msg) {
QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'v';
QStringList params;
- params << bufname << m << nicks;
- emit putCmd("MODE", params);
+ params << bufferInfo.bufferName() << m << nicks;
+ emit putCmd("MODE", serverEncode(params));
}
+void UserInputHandler::handleWho(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ emit putCmd("WHO", serverEncode(msg.split(' ')));
+}
-void UserInputHandler::defaultHandler(QString cmd, QString bufname, QString msg) {
- emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg));
+void UserInputHandler::handleWhois(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ emit putCmd("WHOIS", serverEncode(msg.split(' ')));
+}
+
+void UserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ emit putCmd("WHOWAS", serverEncode(msg.split(' ')));
+}
+void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) {
+ Q_UNUSED(bufferInfo)
+ emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd).arg(msg));
}
projects / quassel.git / blobdiff