chipmunkmc/gamja-old
1
0
Fork 0
mirror of https://git.sr.ht/~emersion/gamja synced 2024-11-14 19:25:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't auto-join without prompting user

Browse source
This commit is contained in:
Simon Ser 2021-11-08 13:01:54 +01:00
parent f3c48a3748
commit 9475ffb8c6
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/app.js
View file

@ -229,6 +229,8 @@ export default class App extends Component {
}; };
} }
let autojoin = [];
let queryParams = parseQueryString(); let queryParams = parseQueryString();
// Don't allow to silently override the server URL if there's one in // Don't allow to silently override the server URL if there's one in
// config.json, because this has security implications. But still allow // config.json, because this has security implications. But still allow
@ -245,19 +247,28 @@ export default class App extends Component {
connectParams.nick = queryParams.nick; connectParams.nick = queryParams.nick;
} }
if (typeof queryParams.channels === "string") { if (typeof queryParams.channels === "string") {
connectParams.autojoin = queryParams.channels.split(","); autojoin = queryParams.channels.split(",");
} }
if (typeof queryParams.open === "string") { if (typeof queryParams.open === "string") {
this.autoOpenURL = irc.parseURL(queryParams.open); this.autoOpenURL = irc.parseURL(queryParams.open);
} }
if (window.location.hash) { if (window.location.hash) {
connectParams.autojoin = window.location.hash.split(","); autojoin = window.location.hash.split(",");
} }
this.config = config; this.config = config;
if (autojoin.length > 0) {
if (connectParams.autoconnect) {
// Ask the user whether they want to join that new channel.
// TODO: support multiple channels here
this.autoOpenURL = { host: "", entity: autojoin[0] };
} else {
connectParams.autojoin = autojoin;
}
}
this.setState({ connectParams: connectParams }); this.setState({ connectParams: connectParams });
if (connectParams.autoconnect) { if (connectParams.autoconnect) {