diff --git a/html/src/app.js b/html/src/app.js index 027582e4..801ecf23 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -1723,6 +1723,9 @@ speechSynthesis.getVoices(); var tag = $app.customUserTags.get(json.id); ref.$customTag = tag.tag; ref.$customTagColour = tag.colour; + } else if (ref.$customTag) { + ref.$customTag = ''; + ref.$customTagColour = ''; } ref.$isVRCPlus = ref.tags.includes('system_supporter'); this.applyUserTrustLevel(ref); @@ -14066,7 +14069,7 @@ speechSynthesis.getVoices(); inputErrorMessage: $t('prompt.direct_access_omni.input_error'), callback: (action, instance) => { if (action === 'confirm' && instance.inputValue) { - var input = instance.inputValue; + var input = instance.inputValue.trim(); if (!this.directAccessParse(input)) { this.$message({ message: $t( @@ -14083,7 +14086,7 @@ speechSynthesis.getVoices(); $app.methods.directAccessPaste = function () { AppApi.GetClipboard().then((clipboard) => { - if (!this.directAccessParse(clipboard)) { + if (!this.directAccessParse(clipboard.trim())) { this.promptOmniDirectDialog(); } }); @@ -14153,7 +14156,7 @@ speechSynthesis.getVoices(); if (!input) { return false; } - if (this.directAccessWorld(input.trim())) { + if (this.directAccessWorld(input)) { return true; } if (input.startsWith('https://vrchat.')) { @@ -14190,13 +14193,13 @@ speechSynthesis.getVoices(); input.substring(0, 4) === 'usr_' || /^[A-Za-z0-9]{10}$/g.test(input) ) { - this.showUserDialog(input.trim()); + this.showUserDialog(input); return true; } else if (input.substring(0, 5) === 'avtr_') { - this.showAvatarDialog(input.trim()); + this.showAvatarDialog(input); return true; } else if (input.substring(0, 4) === 'grp_') { - this.showGroupDialog(input.trim()); + this.showGroupDialog(input); return true; } return false; @@ -21729,6 +21732,9 @@ speechSynthesis.getVoices(); this.photonLastEvent7List = Date.parse(data.dt); break; case 'VrcxMessage': + if (this.debugPhotonLogging) { + console.log('VrcxMessage:', data); + } this.eventVrcxMessage(data); break; case 'Ping': @@ -21800,6 +21806,16 @@ speechSynthesis.getVoices(); case 'CustomTag': this.addCustomTag(data); break; + case 'ClearCustomTags': + this.customUserTags.forEach((value, key) => { + this.customUserTags.delete(key); + var ref = API.cachedUsers.get(key); + if (typeof ref !== 'undefined') { + ref.$customTag = ''; + ref.$customTagColour = ''; + } + }); + break; case 'Noty': var entry = { created_at: new Date().toJSON(), @@ -21809,9 +21825,6 @@ speechSynthesis.getVoices(); database.addGamelogEventToDatabase(entry); this.queueGameLogNoty(entry); this.addGameLog(entry); - if (data.Tag) { - this.addCustomTag(data); - } break; default: console.log('VRCXMessage:', data); diff --git a/html/src/localization/strings/en.json b/html/src/localization/strings/en.json index 13e78924..e66f40f5 100644 --- a/html/src/localization/strings/en.json +++ b/html/src/localization/strings/en.json @@ -204,7 +204,7 @@ }, "game_log": { "header": "Game Log", - "resource_load": "Log Resource Load entries" + "resource_load": "Log Udon resource load" }, "legal_notice": { "header": "Legal Notice",