diff --git a/LogWatcher.cs b/LogWatcher.cs index bf8f1a78..b1c69bec 100644 --- a/LogWatcher.cs +++ b/LogWatcher.cs @@ -401,6 +401,8 @@ namespace VRCX userDisplayName }); + logContext.onJoinPhotonDisplayName = userDisplayName; + return true; } @@ -713,11 +715,11 @@ namespace VRCX // 2021.11.02 02:21:41 Log - [Behaviour] Configuring remote player VRCPlayer[Remote] 22349737 1194 // 2021.11.02 02:21:41 Log - [Behaviour] Initialized player Natsumi-sama - // 2021.11.10 08:06:12 Log - [Behaviour] Natsumi-sama: Limb IK - // 2021.11.10 08:06:12 Log - [Behaviour] NatsumiDa: 3 Point IK // 2021.11.10 08:10:28 Log - [Behaviour] Initialize Limb Avatar (UnityEngine.Animator) VRCPlayer[Remote] 78614426 59 (DŽDŽDŽDžDŽDžDžDŽDžDŽDŽDžDžDŽDžDŽDžDžDžDŽDŽDŽDžDŽDŽDžDžDŽDžDžDŽDžDžDŽDžDžDžDžDŽDžDŽDžDŽDŽDŽDŽDž) False Loading // 2021.11.10 08:57:32 Log - [Behaviour] Initialize Limb Avatar (UnityEngine.Animator) VRCPlayer[Local] 59136629 1 (DŽDŽDŽDžDŽDžDžDŽDžDŽDŽDžDžDŽDžDŽDžDžDžDŽDŽDŽDžDŽDŽDžDžDŽDžDžDŽDžDžDŽDžDžDžDžDŽDžDŽDžDŽDŽDŽDŽDž) True Loading + // 2022.03.05 11:29:16 Log - [Behaviour] Initialize ThreePoint Avatar (UnityEngine.Animator) VRCPlayer[Local] 50608765 1 (DŽDžDŽDŽDŽDžDŽDžDžDŽDžDŽDŽDžDžDŽDŽDŽDžDŽDŽDŽDžDŽDžDŽDžDžDŽDŽDŽDŽDžDžDŽDŽDŽDŽDžDžDŽDŽDžDŽDŽDžDž) True Custom + if (line.Contains("] Initialize ") && line.Contains(" Avatar (UnityEngine.Animator) VRCPlayer[")) { var pos = -1; @@ -756,28 +758,6 @@ namespace VRCX } } - if (line.Contains(": 3 Point IK") || line.Contains(": Limb IK")) - { - var lineOffset = line.IndexOf("] "); - if (lineOffset < 0) - return false; - lineOffset += 2; - - if (line.Contains(": 3 Point IK")) - { - var endPos = line.LastIndexOf(": 3 Point IK"); - logContext.onJoinPhotonDisplayName = line.Substring(lineOffset, endPos - lineOffset); - return true; - } - - if (line.Contains(": Limb IK")) - { - var endPos = line.LastIndexOf(": Limb IK"); - logContext.onJoinPhotonDisplayName = line.Substring(lineOffset, endPos - lineOffset); - return true; - } - } - return false; } diff --git a/html/src/app.js b/html/src/app.js index cdc5db3d..d8df365d 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -9265,7 +9265,6 @@ speechSynthesis.getVoices(); } API.applyAvatar({ id: avatar.id, - assetUrl: avatar.assetUrl, // remove this authorId: avatar.authorId, authorName: avatar.authorName, updated_at: avatar.updated_at, @@ -9298,6 +9297,9 @@ speechSynthesis.getVoices(); // skip PyPyDance and VRDancing videos try { var url = new URL(videoUrl); + if (url.origin === 'https://t-ne.x0.to') { + url = new URL(url.searchParams.get('url')); + } var id1 = url.pathname; var id2 = url.searchParams.get('v'); if (id1 && id1.length === 12) { @@ -9738,22 +9740,27 @@ speechSynthesis.getVoices(); return args; }); } + if (this.isGameNoVR) { + var platform = 'Desktop'; + } else { + var platform = 'VR'; + } switch (L.accessType) { case 'public': L.joinUrl = getLaunchURL(L.worldId, L.instanceId); - L.accessName = `Public #${L.instanceName}`; + L.accessName = `Public #${L.instanceName} (${platform})`; break; case 'invite+': - L.accessName = `Invite+ #${L.instanceName}`; + L.accessName = `Invite+ #${L.instanceName} (${platform})`; break; case 'invite': - L.accessName = `Invite #${L.instanceName}`; + L.accessName = `Invite #${L.instanceName} (${platform})`; break; case 'friends': - L.accessName = `Friends #${L.instanceName}`; + L.accessName = `Friends #${L.instanceName} (${platform})`; break; case 'friends+': - L.accessName = `Friends+ #${L.instanceName}`; + L.accessName = `Friends+ #${L.instanceName} (${platform})`; break; } } @@ -10570,7 +10577,7 @@ speechSynthesis.getVoices(); API.getFriendStatus({ userId: id }).then((args) => { - if (args.json.isFriend) { + if (args.json.isFriend && this.friendLog.has(id)) { var friendLogHistory = { created_at: new Date().toJSON(), type: 'Friend', @@ -10616,7 +10623,7 @@ speechSynthesis.getVoices(); API.getFriendStatus({ userId: id }).then((args) => { - if (!args.json.isFriend) { + if (!args.json.isFriend && this.friendLog.has(id)) { var friendLogHistory = { created_at: new Date().toJSON(), type: 'Unfriend', @@ -10659,7 +10666,7 @@ speechSynthesis.getVoices(); API.getFriendStatus({ userId: ref.id }).then((args) => { - if (args.json.isFriend) { + if (args.json.isFriend && this.friendLog.has(ref.id)) { if (ctx.displayName) { var friendLogHistory = { created_at: new Date().toJSON(),