if(!joinString.isEmpty()) userInputHandler()->handleJoin(statusBuf, joinString);
}
-void NetworkConnection::disconnectFromIrc(bool requested) {
+void NetworkConnection::disconnectFromIrc(bool requested, const QString &reason) {
_quitRequested = requested; // see socketDisconnected();
_autoReconnectTimer.stop();
_autoReconnectCount = 0; // prohibiting auto reconnect
displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting."));
if(socket.state() == QAbstractSocket::UnconnectedState) {
socketDisconnected();
- } else if(socket.state() < QAbstractSocket::ConnectedState) {
+ } else if(socket.state() < QAbstractSocket::ConnectedState || !requested) {
+ // we might be in a state waiting for a timeout...
+ // or (!requested) this is a core shutdown...
+ // in both cases we don't really care... set a disconnected state
socket.close();
- // we might be in a state waiting for a timeout... we don't care... set a disconnected state
socketDisconnected();
} else {
- _socketCloseTimer.start(10000); // the irc server has 10 seconds to close the socket
+ // quit gracefully if it's user requested quit
+ userInputHandler()->issueQuit(reason);
+ // the irc server has 10 seconds to close the socket
+ _socketCloseTimer.start(10000);
}
}
_autoWhoInProgress.clear();
_socketCloseTimer.stop();
-
+
+ IrcUser *me = network()->me();
+ if(me) {
+ foreach(QString channel, me->channels())
+ emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, "", me->hostmask());
+ }
+
network()->setConnected(false);
emit disconnected(networkId());
if(_quitRequested) {
public slots:
// void setServerOptions();
void connectToIrc(bool reconnecting = false);
- void disconnectFromIrc(bool requested = true);
+ void disconnectFromIrc(bool requested = true, const QString &reason = QString());
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) {
Q_UNUSED(bufferInfo)
+ networkConnection()->disconnectFromIrc(true, msg);
+}
+void UserInputHandler::issueQuit(const QString &reason) {
QString quitReason;
- if(msg.isEmpty())
+ if(reason.isEmpty())
quitReason = networkConnection()->identity()->quitReason();
else
- quitReason = msg;
-
+ quitReason = reason;
emit putCmd("QUIT", serverEncode(quitReason));
- networkConnection()->disconnectFromIrc();
}
void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) {
void defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &text);
+ void issueQuit(const QString &reason);
+
private:
void expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg);
void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);