X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=b03b0d718c406281324169f14ca64beffdb36eed;hp=563e6f073f57b28bbf47be8ab422dc35b3fb5b2d;hb=fd80315c076ede937f5d51ba6f8061a32d0107ec;hpb=026199305d921c1ddbe706cd0da86ae058f48647

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 563e6f07..b03b0d71 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -57,11 +57,23 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) {
   // NOTE: This assumes that this is true in raw encoding, but well, hopefully there are no servers running in japanese on protocol level...
   int idx = msg.indexOf(" :");
   if(idx >= 0) {
-    if(msg.length() > idx + 2) trailing = msg.mid(idx + 2);
+    if(msg.length() > idx + 2)
+      trailing = msg.mid(idx + 2);
     msg = msg.left(idx);
   }
   // OK, now it is safe to split...
   QList<QByteArray> params = msg.split(' ');
+
+  // This could still contain empty elements due to (faulty?) ircds sending multiple spaces in a row
+  // Also, QByteArray is not nearly as convenient to work with as QString for such things :)
+  QList<QByteArray>::iterator iter = params.begin();
+  while(iter != params.end()) {
+    if(iter->isEmpty())
+      iter = params.erase(iter);
+    else
+      ++iter;
+  }
+
   if(!trailing.isEmpty()) params << trailing;
   if(params.count() < 1) {
     qWarning() << "Received invalid string from server!";
@@ -174,9 +186,23 @@ void IrcServerHandler::handleJoin(const QString &prefix, const QList<QByteArray>
 
   QString channel = serverDecode(params[0]);
   IrcUser *ircuser = network()->updateNickFromMask(prefix);
-  emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, prefix);
+
+  bool handledByNetsplit = false;
+  if(!_netsplits.empty()) {
+    foreach(Netsplit* n, _netsplits) {
+      handledByNetsplit = n->userJoined(prefix, channel);
+      if(handledByNetsplit)
+        break;
+    }
+  }
+
+  // normal join
+  if(!handledByNetsplit) {
+    emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, prefix);
+    ircuser->joinChannel(channel);
+  }
   //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params;
-  ircuser->joinChannel(channel);
+
   if(network()->isMe(ircuser)) {
     network()->setChannelJoined(channel);
     putCmd("MODE", params[0]); // we want to know the modes of the channel we just joined, so we ask politely
@@ -327,35 +353,41 @@ void IrcServerHandler::handleNotice(const QString &prefix, const QList<QByteArra
   if(!checkParamCount("IrcServerHandler::handleNotice()", params, 2))
     return;
 
-  QString target = serverDecode(params[0]);
-
-  // special treatment for welcome messages like:
-  // :ChanServ!ChanServ@services. NOTICE egst :[#apache] Welcome, this is #apache. Please read the in-channel topic message. This channel is being logged by IRSeekBot. If you have any question please see http://blog.freenode.net/?p=68
-  if(!network()->isChannelName(target)) {
-    QString msg = serverDecode(params[1]);
-    QRegExp welcomeRegExp("^\\[([^\\]]+)\\] ");
-    if(welcomeRegExp.indexIn(msg) != -1) {
-      QString channelname = welcomeRegExp.cap(1);
-      msg = msg.mid(welcomeRegExp.matchedLength());
-      CoreIrcChannel *chan = static_cast<CoreIrcChannel *>(network()->ircChannel(channelname)); // we only have CoreIrcChannels in the core, so this cast is safe
-      if(chan && !chan->receivedWelcomeMsg()) {
-        chan->setReceivedWelcomeMsg();
-        emit displayMsg(Message::Notice, BufferInfo::ChannelBuffer, channelname, msg, prefix);
-        return;
+
+  QStringList targets = serverDecode(params[0]).split(',', QString::SkipEmptyParts);
+  QStringList::const_iterator targetIter;
+  for(targetIter = targets.constBegin(); targetIter != targets.constEnd(); targetIter++) {
+    QString target = *targetIter;
+
+    // special treatment for welcome messages like:
+    // :ChanServ!ChanServ@services. NOTICE egst :[#apache] Welcome, this is #apache. Please read the in-channel topic message. This channel is being logged by IRSeekBot. If you have any question please see http://blog.freenode.net/?p=68
+    if(!network()->isChannelName(target)) {
+      QString msg = serverDecode(params[1]);
+      QRegExp welcomeRegExp("^\\[([^\\]]+)\\] ");
+      if(welcomeRegExp.indexIn(msg) != -1) {
+        QString channelname = welcomeRegExp.cap(1);
+        msg = msg.mid(welcomeRegExp.matchedLength());
+        CoreIrcChannel *chan = static_cast<CoreIrcChannel *>(network()->ircChannel(channelname)); // we only have CoreIrcChannels in the core, so this cast is safe
+        if(chan && !chan->receivedWelcomeMsg()) {
+          chan->setReceivedWelcomeMsg();
+          emit displayMsg(Message::Notice, BufferInfo::ChannelBuffer, channelname, msg, prefix);
+          continue;
+        }
       }
     }
-  }
 
-  if(prefix.isEmpty() || target == "AUTH") {
-    target = "";
-  } else {
-    if(!target.isEmpty() && network()->prefixes().contains(target[0]))
-      target = target.mid(1);
-    if(!network()->isChannelName(target))
-      target = nickFromMask(prefix);
+    if(prefix.isEmpty() || target == "AUTH") {
+      target = "";
+    } else {
+      if(!target.isEmpty() && network()->prefixes().contains(target[0]))
+        target = target.mid(1);
+      if(!network()->isChannelName(target))
+        target = nickFromMask(prefix);
+    }
+
+    network()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
   }
 
-  network()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
 }
 
 void IrcServerHandler::handlePart(const QString &prefix, const QList<QByteArray> &params) {
@@ -416,18 +448,23 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList<QByteArr
     return;
   }
 
-  QString target = serverDecode(params[0]);
+  QString senderNick = nickFromMask(prefix);
 
   QByteArray msg = params.count() < 2
     ? QByteArray("")
     : params[1];
 
-  if(!network()->isChannelName(target))
-    target = nickFromMask(prefix);
+  QStringList targets = serverDecode(params[0]).split(',', QString::SkipEmptyParts);
+  QStringList::const_iterator targetIter;
+  for(targetIter = targets.constBegin(); targetIter != targets.constEnd(); targetIter++) {
+    const QString &target = network()->isChannelName(*targetIter)
+      ? *targetIter
+      : senderNick;
 
-  // it's possible to pack multiple privmsgs into one param using ctcp
-  // - > we let the ctcpHandler do the work
-  network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg);
+    // it's possible to pack multiple privmsgs into one param using ctcp
+    // - > we let the ctcpHandler do the work
+    network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg);
+  }
 }
 
 void IrcServerHandler::handleQuit(const QString &prefix, const QList<QByteArray> &params) {
@@ -438,10 +475,28 @@ void IrcServerHandler::handleQuit(const QString &prefix, const QList<QByteArray>
   if(params.count() > 0)
     msg = userDecode(ircuser->nick(), params[0]);
 
-  foreach(QString channel, ircuser->channels())
-    emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix);
-
-  ircuser->quit();
+  // check if netsplit
+  if(Netsplit::isNetsplit(msg)) {
+    Netsplit *n;
+    if(!_netsplits.contains(msg)) {
+      n = new Netsplit();
+      connect(n, SIGNAL(finished()), this, SLOT(handleNetsplitFinished()));
+      connect(n, SIGNAL(netsplitJoin(QString,QStringList,QString)), this, SLOT(handleNetsplitJoin(QString,QStringList,QString)));
+      connect(n, SIGNAL(netsplitQuit(QString,QStringList,QString)), this, SLOT(handleNetsplitQuit(QString,QStringList,QString)));
+      _netsplits.insert(msg, n);
+    }
+    else {
+      n = _netsplits[msg];
+    }
+    // add this user to the netsplit
+    n->userQuit(prefix, ircuser->channels(),msg);
+  }
+  // normal quit
+  else {
+    foreach(QString channel, ircuser->channels())
+      emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, msg, prefix);
+    ircuser->quit();
+  }
 }
 
 void IrcServerHandler::handleTopic(const QString &prefix, const QList<QByteArray> &params) {
@@ -462,7 +517,7 @@ void IrcServerHandler::handleTopic(const QString &prefix, const QList<QByteArray
 
   channel->setTopic(topic);
 
-  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic));
+  emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic));
 }
 
 /* RPL_WELCOME */
@@ -820,6 +875,19 @@ void IrcServerHandler::handle324(const QString &prefix, const QList<QByteArray>
   handleMode(prefix, params);
 }
 
+/* RPL_??? - "<channel> <homepage> */
+void IrcServerHandler::handle328(const QString &prefix, const QList<QByteArray> &params) {
+  Q_UNUSED(prefix);
+  if(!checkParamCount("IrcServerHandler::handle328()", params, 2))
+    return;
+
+  QString channel = serverDecode(params[0]);
+  QString homepage = serverDecode(params[1]);
+
+  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Homepage for %1 is %2").arg(channel, homepage));
+}
+
+
 /* RPL_??? - "<channel> <creation time (unix)>" */
 void IrcServerHandler::handle329(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix);
@@ -848,7 +916,7 @@ void IrcServerHandler::handle331(const QString &prefix, const QList<QByteArray>
   if(chan)
     chan->setTopic(QString());
 
-  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel));
+  emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel));
 }
 
 /* RPL_TOPIC */
@@ -863,7 +931,7 @@ void IrcServerHandler::handle332(const QString &prefix, const QList<QByteArray>
   if(chan)
     chan->setTopic(topic);
 
-  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
+  emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
 }
 
 /* Topic set by... */
@@ -873,7 +941,7 @@ void IrcServerHandler::handle333(const QString &prefix, const QList<QByteArray>
     return;
 
   QString channel = serverDecode(params[0]);
-  emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel,
+  emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel,
                   tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString()));
 }
 
@@ -977,6 +1045,38 @@ void IrcServerHandler::handle433(const QString &prefix, const QList<QByteArray>
   tryNextNick(errnick);
 }
 
+/* Handle signals from Netsplit objects  */
+
+void IrcServerHandler::handleNetsplitJoin(const QString &channel, const QStringList &users, const QString& quitMessage)
+{
+  QString msg = users.join(":").append(':').append(quitMessage);
+  emit displayMsg(Message::NetsplitJoin, BufferInfo::ChannelBuffer, channel, msg);
+
+  foreach(QString user, users) {
+    IrcUser *iu = network()->ircUser(nickFromMask(user));
+    if(iu)
+      iu->joinChannel(channel);
+  }
+}
+
+void IrcServerHandler::handleNetsplitQuit(const QString &channel, const QStringList &users, const QString& quitMessage)
+{
+  QString msg = users.join(":").append(':').append(quitMessage);
+  emit displayMsg(Message::NetsplitQuit, BufferInfo::ChannelBuffer, channel, msg);
+  foreach(QString user, users) {
+    IrcUser *iu = network()->ircUser(nickFromMask(user));
+    if(iu)
+      iu->quit();
+  }
+}
+
+void IrcServerHandler::handleNetsplitFinished()
+{
+  Netsplit* n = qobject_cast<Netsplit*>(sender());
+  _netsplits.remove(_netsplits.key(n));
+  n->deleteLater();
+}
+
 /* */
 
 // FIXME networkConnection()->setChannelKey("") for all ERR replies indicating that a JOIN went wrong