deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-17 21:56:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2702 from thelounge/astorije/connect-override

Browse source 
Fix bugs with URL overrides in Connect window
This commit is contained in:
Pavel Djundik 2018-08-15 11:40:11 +03:00 committed by GitHub
parent 70a3aefd2f 13e6f37eda
commit c9ba896d9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/js/socket-events/configuration.js
View file

@ -176,6 +176,17 @@ function parseOverrideParams(params, data) {
continue;
}
// When the network is locked, URL overrides should not affect disabled fields
if (data.lockNetwork &&
["host", "port", "tls", "rejectUnauthorized"].includes(key)) {
continue;
}
// When the network is not displayed, its name in the UI is not customizable
if (!data.displayNetwork && key === "name") {
continue;
}
if (key === "join") {
value = value.split(",").map((chan) => {
if (!chan.match(/^[#&!+]/)) {

1
src/server.js
View file

@ -590,6 +590,7 @@ function getClientConfiguration(network) {
} else {
// Only send defaults that are visible on the client
config.defaults = _.pick(network || Helper.config.defaults, [
"name",
"nick",
"username",
"password",