X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=b4a74aeec48b584988c3de550e07e40c27e2d4eb;hp=fdb0eb456a88d2fe700670bfad6c166db174934e;hb=5c00beb706c7761d19f9a6b86751193056086b4a;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016;ds=sidebyside

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index fdb0eb45..b4a74aee 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC 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  *
@@ -21,13 +21,13 @@
 
 #include "util.h"
 
-#include "server.h"
-#include "networkinfo.h"
+#include "networkconnection.h"
+#include "network.h"
 #include "ctcphandler.h"
 
 #include <QDebug>
 
-UserInputHandler::UserInputHandler(Server *parent)
+UserInputHandler::UserInputHandler(NetworkConnection *parent)
   : BasicHandler(parent) {
 }
 
@@ -56,6 +56,32 @@ void UserInputHandler::handleAway(QString bufname, QString msg) {
   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) {
+  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';
@@ -79,7 +105,7 @@ void UserInputHandler::handleInvite(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleJoin(QString bufname, QString msg) {
-  emit putCmd("JOIN", QStringList(msg));
+  emit putCmd("JOIN", msg.split(" "));
 }
 
 void UserInputHandler::handleKick(QString bufname, QString msg) {
@@ -92,6 +118,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 +160,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);
@@ -147,18 +183,12 @@ void UserInputHandler::handleSay(QString bufname, QString msg) {
   params << bufname << msg;
   emit putCmd("PRIVMSG", params);
   if(isChannelName(bufname)) {
-    emit displayMsg(Message::Plain, params[0], msg, networkInfo()->myNick(), Message::Self);
+    emit displayMsg(Message::Plain, params[0], msg, network()->myNick(), Message::Self);
   } else {
-    emit displayMsg(Message::Plain, params[0], msg, networkInfo()->myNick(), Message::Self|Message::PrivMsg);
+    emit displayMsg(Message::Plain, params[0], msg, network()->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());
-}
-
 void UserInputHandler::handleTopic(QString bufname, QString msg) {
   if(bufname.isEmpty()) return;
   QStringList params;
@@ -174,10 +204,20 @@ void UserInputHandler::handleVoice(QString bufname, QString msg) {
   emit putCmd("MODE", params);
 }
 
+void UserInputHandler::handleWho(QString bufname, QString msg) {
+  emit putCmd("WHO", msg.split(' '));
+}
+
+void UserInputHandler::handleWhois(QString bufname, QString msg) {
+  emit putCmd("WHOIS", msg.split(' '));
+}
+
+void UserInputHandler::handleWhowas(QString bufname, QString msg) {
+  emit putCmd("WHOWAS", msg.split(' '));
+}
 
 void UserInputHandler::defaultHandler(QString cmd, QString bufname, QString msg) {
   emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg));
-
 }