skorotkiewicz/gamja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow paths in server URL query param

Browse source
This commit is contained in:
Simon Ser 2020-07-01 12:25:57 +02:00
parent db13f34a40
commit c309d3cff6
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/app.js
View file

@ -67,17 +67,24 @@ export default class App extends Component {
} else { } else {
var params = parseQueryString(); var params = parseQueryString();
if (params.server) { var host = window.location.host || "localhost:8080";
this.state.connectParams.serverURL = params.server; var proto = "wss:";
} else { if (window.location.protocol != "https:") {
var host = window.location.host || "localhost:8080"; proto = "ws:";
var proto = "wss:";
if (window.location.protocol != "https:") {
proto = "ws:";
}
this.state.connectParams.serverURL = proto + "//" + host + "/socket";
} }
var serverURL;
if (params.server) {
if (params.server.startsWith("/")) {
serverURL = proto + "//" + host + params.server;
} else {
serverURL = params.server;
}
} else {
serverURL = proto + "//" + host + "/socket";
}
this.state.connectParams.serverURL = serverURL;
if (params.channels) { if (params.channels) {
this.state.connectParams.autojoin = params.channels.split(","); this.state.connectParams.autojoin = params.channels.split(",");
} }