deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-01 13:22:29 +02:00
Code Issues Projects Releases Wiki Activity

Do not reconnect if STS cap is received in CAP NEW

Browse source
This commit is contained in:
Pavel Djundik 2020-02-19 20:20:28 +02:00
parent db866f9823
commit 8976fa163e
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/plugins/irc-events/cap.js
View file

@ -7,14 +7,14 @@ module.exports = function(irc, network) {
const client = this; const client = this;
irc.on("cap ls", (data) => { irc.on("cap ls", (data) => {
handleSTS(data); handleSTS(data, true);
}); });
irc.on("cap new", (data) => { irc.on("cap new", (data) => {
handleSTS(data); handleSTS(data, false);
}); });
function handleSTS(data) { function handleSTS(data, shouldReconnect) {
if (!Object.prototype.hasOwnProperty.call(data.capabilities, "sts")) { if (!Object.prototype.hasOwnProperty.call(data.capabilities, "sts")) {
return; return;
} }
@ -50,8 +50,12 @@ module.exports = function(irc, network) {
true true
); );
// Forcefully end the connection // Forcefully end the connection if STS is seen in CAP LS
irc.connection.end(); // We will update the port and tls setting if we see CAP NEW,
// but will not force a reconnection
if (shouldReconnect) {
irc.connection.end();
}
// Update the port // Update the port
network.port = port; network.port = port;
@ -63,8 +67,10 @@ module.exports = function(irc, network) {
irc.options.tls = true; irc.options.tls = true;
irc.options.rejectUnauthorized = true; irc.options.rejectUnauthorized = true;
// Start a new connection if (shouldReconnect) {
irc.connect(); // Start a new connection
irc.connect();
}
client.save(); client.save();
} }