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

Unify connect params keys

Browse Source
This commit is contained in:
Simon Ser 2021-05-31 18:04:02 +02:00
parent c632ef4339
commit 4fff2b1b8d
2 changed files with 14 additions and 14 deletions

12
components/app.js

@ -170,8 +170,8 @@ function getBuffer(state, id) {
export default class App extends Component { export default class App extends Component {
state = { state = {
connectParams: { connectParams: {
serverURL: null, url: null,
serverPass: null, pass: null,
username: null, username: null,
realname: null, realname: null,
nick: null, nick: null,
@ -252,11 +252,11 @@ export default class App extends Component {
} }
var connectParams = { var connectParams = {
serverURL: proto + "//" + host + path + "socket", url: proto + "//" + host + path + "socket",
}; };
if (config.server) { if (config.server) {
connectParams.serverURL = 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 { } else {
@ -276,9 +276,9 @@ export default class App extends Component {
var queryParams = parseQueryString(); var queryParams = parseQueryString();
if (queryParams.server) { if (queryParams.server) {
if (queryParams.server.startsWith("/")) { if (queryParams.server.startsWith("/")) {
connectParams.serverURL = proto + "//" + host + queryParams.server; connectParams.url = proto + "//" + host + queryParams.server;
} else { } else {
connectParams.serverURL = queryParams.server; connectParams.url = queryParams.server;
} }
} }
if (queryParams.nick) { if (queryParams.nick) {

16
components/connect-form.js

@ -2,8 +2,8 @@ import { html, Component } from "../lib/index.js";
export default class ConnectForm extends Component { export default class ConnectForm extends Component {
state = { state = {
serverURL: "", url: "",
serverPass: "", pass: "",
nick: "", nick: "",
password: "", password: "",
rememberMe: false, rememberMe: false,
@ -21,7 +21,7 @@ export default class ConnectForm extends Component {
if (props.params) { if (props.params) {
this.state = { this.state = {
...this.state, ...this.state,
serverURL: props.params.serverURL || "", url: props.params.url || "",
nick: props.params.nick || "", nick: props.params.nick || "",
rememberMe: props.params.autoconnect || false, rememberMe: props.params.autoconnect || false,
username: props.params.username || "", username: props.params.username || "",
@ -45,8 +45,8 @@ export default class ConnectForm extends Component {
} }
var params = { var params = {
url: this.state.serverURL, url: this.state.url,
pass: this.state.serverPass, pass: this.state.pass,
nick: this.state.nick, nick: this.state.nick,
autoconnect: this.state.rememberMe, autoconnect: this.state.rememberMe,
username: this.state.username, username: this.state.username,
@ -57,7 +57,7 @@ export default class ConnectForm extends Component {
if (this.state.password) { if (this.state.password) {
params.saslPlain = { params.saslPlain = {
username: params.username, username: params.username || params.nick,
password: this.state.password, password: this.state.password,
}; };
} }
@ -103,7 +103,7 @@ export default class ConnectForm extends Component {
<label> <label>
Server URL:<br/> Server URL:<br/>
<input type="url" name="serverURL" value=${this.state.serverURL} disabled=${this.props.disabled} required/> <input type="url" name="url" value=${this.state.url} disabled=${this.props.disabled} required/>
</label> </label>
<br/><br/> <br/><br/>
@ -121,7 +121,7 @@ export default class ConnectForm extends Component {
<label> <label>
Server password:<br/> Server password:<br/>
<input type="text" name="serverPass" value=${this.state.serverPass} disabled=${this.props.disabled} placeholder="None"/> <input type="text" name="pass" value=${this.state.pass} disabled=${this.props.disabled} placeholder="None"/>
</label> </label>
<br/><br/> <br/><br/>