X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=ea348005adb3d79063bcfd26bdb9a943a30e66b9;hp=9007b0f4586b02e6ec4b5c77869e3626a3ea42e1;hb=0c9cd0eef379e1d3e10a75cc8506a7e65f95fd67;hpb=ba1cff451371eda2cb27a4cc7de2196e68fcc8f7

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 9007b0f4..ea348005 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -53,6 +53,7 @@ void UserInputHandler::handleUserInput(QString bufname, QString msg) {
 // ====================
 
 void UserInputHandler::handleAway(QString bufname, QString msg) {
+  Q_UNUSED(bufname)
   emit putCmd("AWAY", QStringList(msg));
 }
 
@@ -67,20 +68,19 @@ void UserInputHandler::handleBan(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleCtcp(QString bufname, QString msg) {
-  QStringList params = msg.split(" ", QString::SkipEmptyParts);
-  if (params.size() != 2) {
-    // qDebug() << "Ctcp-Request-Error: not exactly two parameters ->" << msg;
-    return;
-  }
-  params[1] = params[1].toUpper();
-  QString verboseMessage = tr("sending CTCP-%1-request").arg(params[1]);
-  if(params[1] == "PING") {
+  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();
-    params.append(QString::number(now));
-  } else {
-    params.append("");
+    message = QString::number(now);
   }
-  server->ctcpHandler()->query(params[0], params[1], params[2]);
+
+  server->ctcpHandler()->query(nick, ctcpTag, message);
   emit displayMsg(Message::Action, "", verboseMessage, network()->myNick());
 }
 
@@ -106,7 +106,17 @@ 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) {
+  Q_UNUSED(bufname)
   emit putCmd("JOIN", msg.split(" "));
 }
 
@@ -117,6 +127,7 @@ void UserInputHandler::handleKick(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleList(QString bufname, QString msg) {
+  Q_UNUSED(bufname)
   emit putCmd("LIST", msg.split(' ', QString::SkipEmptyParts));
 }
 
@@ -128,20 +139,25 @@ void UserInputHandler::handleMe(QString bufname, QString msg) {
 }
 
 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));
 }
@@ -162,20 +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);
-  
+  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);
-  
-  // TODO: usenetworkids
-//   if(!nick.isEmpty())
-//     emit queryRequested(network, nick);
 }
 
 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);
 }
 
@@ -184,11 +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, network()->myNick(), Message::Self);
-  } else {
-    emit displayMsg(Message::Plain, params[0], msg, network()->myNick(), Message::Self|Message::PrivMsg);
-  }
+  emit displayMsg(Message::Plain, params[0], msg, network()->myNick(), Message::Self);
 }
 
 void UserInputHandler::handleTopic(QString bufname, QString msg) {
@@ -207,18 +222,22 @@ void UserInputHandler::handleVoice(QString bufname, QString msg) {
 }
 
 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));
 }