X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=3f150150e09a8aebaf0d68d8766e1f619aa25970;hp=cb4c1534f1d8e7e1e3961020cd5b04ca65ab3ad8;hb=4044bd5ea91ea4c8b00711bbb6b837aeba630b74;hpb=7a6e882282779ac24e015c53e3d9fc746c08063d

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index cb4c1534..3f150150 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -155,9 +155,15 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList<QByteAr
         emit displayMsg(Message::Error, "", params.join(" "), prefix);
         break;
       // Server error messages, display them in red. First param will be appended.
-      case 401: case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
-      { QString p = params.takeFirst();
-        emit displayMsg(Message::Error, "", params.join(" ") + " " + p, prefix);
+      case 401: 
+      { QString channelName = params.takeFirst();
+        emit displayMsg(Message::Error, "", params.join(" ") + " " + channelName, prefix);
+        emit displayMsg(Message::Error, channelName, params.join(" ") + " " + channelName, prefix);
+        break;
+      }
+      case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
+      { QString channelName = params.takeFirst();
+        emit displayMsg(Message::Error, "", params.join(" ") + " " + channelName, prefix);
         break;
       }
       // Server error messages which will be displayed with a colon between the first param and the rest
@@ -272,10 +278,24 @@ void IrcServerHandler::handleNick(QString prefix, QList<QByteArray> params) {
 }
 
 void IrcServerHandler::handleNotice(QString prefix, QList<QByteArray> params) {
-  if(network()->currentServer().isEmpty() || network()->currentServer() == prefix)
+  if(params.count() < 2) {
+    qWarning() << "IrcServerHandler::handleNotice(): not enoug Parameters:" << prefix << serverDecode(params);
+    return;
+  }
+
+  // check if it's only a Server Message or if it's a regular Notice
+  if(network()->currentServer().isEmpty() || network()->currentServer() == prefix) {
     emit displayMsg(Message::Server, "", serverDecode(params[1]), prefix);
-  else
-    emit displayMsg(Message::Notice, "", userDecode(prefix, params[1]), prefix);
+    return;
+  }
+
+  QString target = serverDecode(params[0]);
+
+  // kick notices to the server buffer if they are directly addressed to us
+  if(network()->isMyNick(target))
+    target = QString("");
+
+  networkConnection->ctcpHandler()->parse(Message::Notice, prefix, target, userDecode(prefix, params[1]));
 }
 
 void IrcServerHandler::handlePart(QString prefix, QList<QByteArray> params) {
@@ -305,34 +325,13 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList<QByteArray> params) {
 
   QString target = serverDecode(params[0]);
 
-  // are we the target or is it a channel?
-  if(network()->isMyNick(target)) {
-    // it's possible to pack multiple privmsgs into one param using ctcp
-    QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, userDecode(ircuser->nick(), params[1]));
-    quint8 flags;
-    foreach(QString message, messages) {
-      flags = Message::PrivMsg;
-      if(message.contains(network()->myNick()))
-	flags |= Message::Highlight;
-      emit displayMsg(Message::Plain, "", message, prefix, flags);
-    }
-  } else {
-    // so it's probably a channel..
-    if(!isChannelName(target)) {
-      qWarning() << "received PRIVMSG with target" << target << "which is neither us nor a channel!";
-      return;
-    }
-
-    QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1]));
-    quint8 flags;
-    foreach(QString message, messages) {
-      flags = Message::None;
-      if(message.contains(network()->myNick()))
-	flags |= Message::Highlight;
-      emit displayMsg(Message::Plain, target, message, prefix, flags);
-    }
-  }
+  // are we the target?
+  if(network()->isMyNick(target))
+    target = nickFromMask(ircuser->nick());
 
+  // it's possible to pack multiple privmsgs into one param using ctcp
+  // - > we let the ctcpHandler do the work
+  networkConnection->ctcpHandler()->parse(Message::Plain, prefix, target, userDecode(ircuser->nick(), params[1]));
 }
 
 void IrcServerHandler::handleQuit(QString prefix, QList<QByteArray> params) {
@@ -418,12 +417,17 @@ void IrcServerHandler::handle301(QString prefix, QList<QByteArray> params) {
   if(_whois) {
     emit displayMsg(Message::Server, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage));
   } else {
-    int now = QDateTime::currentDateTime().toTime_t();
-    int silenceTime = 60;
-    if(ircuser && ircuser->lastAwayMessage() + silenceTime < now) {
+    if(ircuser) {
+      int now = QDateTime::currentDateTime().toTime_t();
+      int silenceTime = 60;
+      if(ircuser->lastAwayMessage() + silenceTime < now) {
+        emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
+      }
+      ircuser->setLastAwayMessage(now);
+    } else {
+      // probably should not happen
       emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
     }
-    ircuser->setLastAwayMessage(now);
   }
 }
 
@@ -538,13 +542,15 @@ void IrcServerHandler::handle352(QString prefix, QList<QByteArray> params) {
   Q_UNUSED(prefix)
   QString channel = serverDecode(params[0]);
   IrcUser *ircuser = network()->ircUser(serverDecode(params[4]));
-  ircuser->setUser(serverDecode(params[1]));
-  ircuser->setHost(serverDecode(params[2]));
+  if(ircuser) {
+    ircuser->setUser(serverDecode(params[1]));
+    ircuser->setHost(serverDecode(params[2]));
 
-  bool away = serverDecode(params[5]).startsWith("G") ? true : false;
-  ircuser->setAway(away);
-  ircuser->setServer(serverDecode(params[3])); 
-  ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
+    bool away = serverDecode(params[5]).startsWith("G") ? true : false;
+    ircuser->setAway(away);
+    ircuser->setServer(serverDecode(params[3])); 
+    ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
+  }
 
   emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
 }