CringeStudios/gamja
5
0
Fork 1
mirror of https://codeberg.org/emersion/gamja synced 2025-03-13 07:48:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary if in App.handleConfig

Browse Source 
config.json is merged with baseConfig. The latter is guaranteed
to contain a "server" field.
This commit is contained in:
Simon Ser 2022-09-12 09:54:38 +02:00
parent a13f74d466
commit 34d3bd6df9
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
components/app.js
View File

@ -254,32 +254,30 @@ export default class App extends Component {
let connectParams = { ...this.state.connectParams }; let connectParams = { ...this.state.connectParams };
if (config.server) { if (typeof config.server.url === "string") {
if (typeof config.server.url === "string") { connectParams.url = config.server.url;
connectParams.url = config.server.url; }
} if (Array.isArray(config.server.autojoin)) {
if (Array.isArray(config.server.autojoin)) { connectParams.autojoin = config.server.autojoin;
connectParams.autojoin = config.server.autojoin; } else if (typeof config.server.autojoin === "string") {
} else if (typeof config.server.autojoin === "string") { connectParams.autojoin = [config.server.autojoin];
connectParams.autojoin = [config.server.autojoin]; }
} if (typeof config.server.nick === "string") {
if (typeof config.server.nick === "string") { connectParams.nick = config.server.nick;
connectParams.nick = config.server.nick; }
} if (typeof config.server.autoconnect === "boolean") {
if (typeof config.server.autoconnect === "boolean") { connectParams.autoconnect = config.server.autoconnect;
connectParams.autoconnect = config.server.autoconnect; }
} if (config.server.auth === "external") {
if (config.server.auth === "external") { connectParams.saslExternal = true;
connectParams.saslExternal = true; }
} if (typeof config.server.ping === "number") {
if (typeof config.server.ping === "number") { connectParams.ping = config.server.ping;
connectParams.ping = config.server.ping; }
}
if (connectParams.autoconnect && config.server.auth === "mandatory") { if (connectParams.autoconnect && config.server.auth === "mandatory") {
console.error("Error in config.json: cannot set server.autoconnect = true and server.auth = \"mandatory\""); console.error("Error in config.json: cannot set server.autoconnect = true and server.auth = \"mandatory\"");
connectParams.autoconnect = false; connectParams.autoconnect = false;
}
} }
let autoconnect = store.autoconnect.load(); let autoconnect = store.autoconnect.load();