From 9ab080c1072e8b5d10a9a51d9ee503fa0387b482 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 2 Feb 2026 17:55:32 +0100 Subject: [PATCH 1/4] add ssl scheme --- src/network/serverinfo.h | 1 + src/network/websocketconnection.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/network/serverinfo.h b/src/network/serverinfo.h index 1f13e3e68..ef7a64fab 100644 --- a/src/network/serverinfo.h +++ b/src/network/serverinfo.h @@ -10,6 +10,7 @@ class ServerInfo QString address; quint16 port = 0; bool legacy = false; + bool ssl = false; QString toString() const; }; diff --git a/src/network/websocketconnection.cpp b/src/network/websocketconnection.cpp index 9d9183caa..402a84ef2 100644 --- a/src/network/websocketconnection.cpp +++ b/src/network/websocketconnection.cpp @@ -32,7 +32,10 @@ void WebSocketConnection::connectToServer(const ServerInfo &server) disconnectFromServer(); QUrl url; - url.setScheme("ws"); + if (server.ssl) + url.setScheme("wss"); + else + url.setScheme("ws"); url.setHost(server.address); url.setPort(server.port); From 67836270240d8d6a43a8f1f77bfb72e43a536c82 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 2 Feb 2026 18:00:31 +0100 Subject: [PATCH 2/4] use protocol --- src/network/serverinfo.h | 3 +-- src/network/websocketconnection.cpp | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/network/serverinfo.h b/src/network/serverinfo.h index ef7a64fab..de91a011c 100644 --- a/src/network/serverinfo.h +++ b/src/network/serverinfo.h @@ -9,8 +9,7 @@ class ServerInfo QString description; QString address; quint16 port = 0; - bool legacy = false; - bool ssl = false; + QString protocol = "ws"; QString toString() const; }; diff --git a/src/network/websocketconnection.cpp b/src/network/websocketconnection.cpp index 402a84ef2..e9cc1ef9f 100644 --- a/src/network/websocketconnection.cpp +++ b/src/network/websocketconnection.cpp @@ -32,10 +32,7 @@ void WebSocketConnection::connectToServer(const ServerInfo &server) disconnectFromServer(); QUrl url; - if (server.ssl) - url.setScheme("wss"); - else - url.setScheme("ws"); + url.setScheme(server.protocol); url.setHost(server.address); url.setPort(server.port); From 5c47986e74e7065344cf1b50e25190790f696aac Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 2 Feb 2026 18:02:01 +0100 Subject: [PATCH 3/4] set port --- src/networkmanager.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp index 500b2c832..1202fec88 100644 --- a/src/networkmanager.cpp +++ b/src/networkmanager.cpp @@ -60,14 +60,20 @@ void NetworkManager::ms_request_finished(QNetworkReply *reply) server.address = entry["ip"].toString(); server.name = entry["name"].toString(); server.description = entry["description"].toString(tr("No description provided.")); - if (entry.contains("ws_port")) + if (entry.contains("wss_port")) + { + server.port = entry["wss_port"].toInt(); + server.protocol = "wss"; + } + else if (entry.contains("ws_port")) { server.port = entry["ws_port"].toInt(); + server.protocol = "ws"; } else { server.port = entry["port"].toInt(); - server.legacy = true; + server.protocol = "tcp"; } if (server.port != 0) From 5fb1d8f1a7beaa2f872e94b7ea3d12ad47d47b6a Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 2 Feb 2026 18:04:24 +0100 Subject: [PATCH 4/4] remove last legacy entry --- src/lobby.cpp | 4 ++-- src/options.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lobby.cpp b/src/lobby.cpp index 871af8b98..05dd9ce4b 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -471,7 +471,7 @@ void Lobby::list_servers() QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_serverlist_tree); treeItem->setData(0, Qt::DisplayRole, i); - if (i_server.legacy) + if (i_server.protocol == "tcp") { treeItem->setText(1, "(Legacy) " + i_server.name); treeItem->setBackground(0, Qt::darkRed); @@ -504,7 +504,7 @@ void Lobby::list_favorites() QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_favorites_tree); treeItem->setData(0, Qt::DisplayRole, i); - if (i_server.legacy) + if (i_server.protocol == "tcp") { treeItem->setText(1, "(Legacy) " + i_server.name); treeItem->setBackground(0, Qt::darkRed); diff --git a/src/options.cpp b/src/options.cpp index caa559c80..0827399a2 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -680,11 +680,11 @@ QVector Options::favorites() f_server.description = favorite.value("desc", "No description").toString(); if (favorite.contains("protocol")) { - f_server.legacy = favorite.value("protocol").toString() == "tcp"; + f_server.protocol = favorite.value("protocol").toString(); } else { - f_server.legacy = favorite.value("legacy", false).toBool(); + f_server.protocol = "tcp"; } serverlist.append(std::move(f_server)); @@ -705,7 +705,7 @@ void Options::setFavorites(QVector value) favorite.setValue("address", fav_server.address); favorite.setValue("port", fav_server.port); favorite.setValue("desc", fav_server.description); - favorite.setValue("legacy", fav_server.legacy); + favorite.setValue("protocol", fav_server.protocol); favorite.endGroup(); } favorite.sync(); @@ -726,7 +726,7 @@ void Options::addFavorite(ServerInfo server) favorite.setValue("address", server.address); favorite.setValue("port", server.port); favorite.setValue("desc", server.description); - favorite.setValue("legacy", server.legacy); + favorite.setValue("protocol", server.protocol); favorite.endGroup(); favorite.sync(); } @@ -738,7 +738,7 @@ void Options::updateFavorite(ServerInfo server, int index) favorite.setValue("address", server.address); favorite.setValue("port", server.port); favorite.setValue("desc", server.description); - favorite.setValue("legacy", server.legacy); + favorite.setValue("protocol", server.protocol); favorite.endGroup(); favorite.sync(); }