chipmunkmc/gamja
1
0
Fork 0
mirror of https://codeberg.org/emersion/gamja.git synced 2024-11-14 19:05:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure config has a server object

Browse source 
Simplifies code accessing the config.
This commit is contained in:
Simon Ser 2021-06-10 18:34:34 +02:00
parent 093eecff91
commit e56deb35c9
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/app.js
View file

@ -18,6 +18,10 @@ import commands from "../commands.js";
import { setup as setupKeybindings } from "../keybindings.js";
import * as store from "../store.js";
const baseConfig = {
server: {},
};
const configPromise = fetch("./config.json")
.then((resp) => {
if (resp.ok) {
@ -31,6 +35,12 @@ const configPromise = fetch("./config.json")
.catch((err) => {
console.error("Failed to fetch config:", err);
return {};
})
.then((config) => {
return {
...baseConfig,
...config,
};
});
const CHATHISTORY_MAX_SIZE = 4000;
@ -127,7 +137,7 @@ export default class App extends Component {
memberList: false,
},
};
config = {};
config = { ...baseConfig };
clients = new Map();
endOfHistory = new Map();
receipts = new Map();
@ -201,9 +211,7 @@ export default class App extends Component {
// When using a custom server, some configuration options don't
// make sense anymore.
if (config.server) {
config.server.auth = null;
}
config.server.auth = null;
}
if (queryParams.nick) {
connectParams.nick = queryParams.nick;
@ -1220,7 +1228,7 @@ export default class App extends Component {
<${ConnectForm}
error=${this.state.error}
params=${this.state.connectParams}
auth=${this.config.server ? this.config.server.auth : null}
auth=${this.config.server.auth}
connecting=${connecting}
onSubmit=${this.handleConnectSubmit}
key=${this.state.connectParams}