changed the behavior of RPL_AWAY server messages:

[quassel.git] / src / core / userinputhandler.cpp

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 9007b0f..232c8cd 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -67,20 +67,18 @@ 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") {
+  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,6 +104,14 @@ void UserInputHandler::handleInvite(QString bufname, QString msg) {
   emit putCmd("INVITE", params);
 }
 
+void UserInputHandler::handleJ(QString bufname, QString msg) {
+  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", msg.split(" "));
 }