}
IrcServerHandler::~IrcServerHandler() {
+ if(!_netsplits.empty())
+ qDeleteAll(_netsplits);
}
/*! Handle a raw message string sent by the server. We try to find a suitable handler, otherwise we call a default handler. */
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
// user channel modes (op, voice, etc...)
if(paramOffset < params.count()) {
IrcUser *ircUser = network()->ircUser(params[paramOffset]);
- if(add)
- channel->addUserMode(ircUser, QString(modes[c]));
+ if(add) {
+ bool handledByNetsplit = false;
+ if(!_netsplits.empty()) {
+ foreach(Netsplit* n, _netsplits) {
+ handledByNetsplit = n->userAlreadyJoined(ircUser->hostmask(), channel->name());
+ if(handledByNetsplit) {
+ n->addMode(ircUser->hostmask(), channel->name(), QString(modes[c]));
+ break;
+ }
+ }
+ }
+ if(!handledByNetsplit)
+ channel->addUserMode(ircUser, QString(modes[c]));
+ }
else
channel->removeUserMode(ircUser, QString(modes[c]));
} else {
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(const QString&, const QStringList&, const QStringList&, const QString&)),
+ this, SLOT(handleNetsplitJoin(const QString&, const QStringList&, const QStringList&, const QString&)));
+ connect(n, SIGNAL(netsplitQuit(const QString&, const QStringList&, const QString&)),
+ this, SLOT(handleNetsplitQuit(const QString&, const QStringList&, const QString&)));
+ connect(n, SIGNAL(earlyJoin(const QString&, const QStringList&, const QStringList&)),
+ this, SLOT(handleEarlyNetsplitJoin(const QString&, const QStringList&, const QStringList&)));
+ _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> ¶ms) {
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 */
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 */
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... */
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()));
}
tryNextNick(errnick);
}
+/* Handle signals from Netsplit objects */
+
+void IrcServerHandler::handleNetsplitJoin(const QString &channel, const QStringList &users, const QStringList &modes, const QString& quitMessage)
+{
+ IrcChannel *ircChannel = network()->ircChannel(channel);
+ if(!ircChannel) {
+ return;
+ }
+ QList<IrcUser *> ircUsers;
+ QStringList newModes = modes;
+
+ foreach(QString user, users) {
+ IrcUser *iu = network()->updateNickFromMask(user);
+ if(iu)
+ ircUsers.append(iu);
+ else {
+ newModes.removeAt(users.indexOf(user));
+ }
+ }
+
+ QString msg = users.join("#:#").append("#:#").append(quitMessage);
+ emit displayMsg(Message::NetsplitJoin, BufferInfo::ChannelBuffer, channel, msg);
+ ircChannel->joinIrcUsers(ircUsers, newModes);
+}
+
+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::handleEarlyNetsplitJoin(const QString &channel, const QStringList &users, const QStringList &modes) {
+ IrcChannel *ircChannel = network()->ircChannel(channel);
+ if(!ircChannel) {
+ qDebug() << "handleEarlyNetsplitJoin(): channel " << channel << " invalid";
+ return;
+ }
+ QList<IrcUser *> ircUsers;
+ QStringList newModes = modes;
+
+ foreach(QString user, users) {
+ IrcUser *iu = network()->updateNickFromMask(user);
+ if(iu) {
+ ircUsers.append(iu);
+ emit displayMsg(Message::Join, BufferInfo::ChannelBuffer, channel, channel, user);
+ }
+ else {
+ newModes.removeAt(users.indexOf(user));
+ }
+ }
+ ircChannel->joinIrcUsers(ircUsers, newModes);
+}
+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
projects / quassel.git / blobdiff