MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 22:46:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix location URL parse

Browse Source
This commit is contained in:
Natsumi
2021-05-30 22:37:38 +12:00
parent c743b2aacb
commit 07a0658fee
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+15 -3
View File
@@ -7654,7 +7654,14 @@ speechSynthesis.getVoices();
var testUrl = instance.inputValue.substring(0, 15); var testUrl = instance.inputValue.substring(0, 15);
if (testUrl === 'https://vrchat.') { if (testUrl === 'https://vrchat.') {
var worldInstance = this.parseLocationUrl(instance.inputValue); var worldInstance = this.parseLocationUrl(instance.inputValue);
this.showWorldDialog(worldInstance); if (worldInstance) {
this.showWorldDialog(worldInstance);
} else {
this.$message({
message: 'Invalid URL',
type: 'error'
});
}
} else { } else {
this.showWorldDialog(instance.inputValue); this.showWorldDialog(instance.inputValue);
} }
@@ -11929,11 +11936,16 @@ speechSynthesis.getVoices();
// Parse location URL // Parse location URL
$app.methods.parseLocationUrl = function (url) { $app.methods.parseLocationUrl = function (location) {
var url = new URL(location);
var urlParams = new URLSearchParams(url.search); var urlParams = new URLSearchParams(url.search);
var worldId = urlParams.get('worldId'); var worldId = urlParams.get('worldId');
var instanceId = urlParams.get('instanceId'); var instanceId = urlParams.get('instanceId');
return `${worldId}:${instanceId}`; if (instanceId) {
return `${worldId}:${instanceId}`;
} else if (worldId) {
return worldId;
}
}; };
// userDialog Favorite Worlds // userDialog Favorite Worlds