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

Add UserId parsing on player joined or left (#943)

Browse Source
This commit is contained in:
Usman Shafiq
2024-10-21 15:06:50 -04:00
committed by GitHub
parent 458c00fdec
commit ddc1604795
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Dotnet/LogWatcher.cs
View File

@@ -455,6 +455,8 @@ namespace VRCX
// 2021.12.12 11:47:22 Log - [Behaviour] OnPlayerJoined:Unnamed
// 2021.12.12 11:53:14 Log - [Behaviour] OnPlayerLeftRoom
// Future logs will be formatted like this: [Behaviour] OnPlayerJoined Natsumi-sama (usr_032383a7-748c-4fb2-94e4-bcb928e5de6b)
if (line.Contains("[Behaviour] OnPlayerJoined") && !line.Contains("] OnPlayerJoined:"))
{
var lineOffset = line.LastIndexOf("] OnPlayerJoined");
@@ -464,14 +466,15 @@ namespace VRCX
if (lineOffset > line.Length)
return true;
var userDisplayName = line.Substring(lineOffset);
var userInfo = ParseUserInfo(line.Substring(lineOffset));
AppendLog(new[]
{
fileInfo.Name,
ConvertLogTimeToISO8601(line),
"player-joined",
userDisplayName
userInfo.DisplayName,
userInfo.UserId
});
return true;
@@ -486,14 +489,15 @@ namespace VRCX
if (lineOffset > line.Length)
return true;
var userDisplayName = line.Substring(lineOffset);
var userInfo = ParseUserInfo(line.Substring(lineOffset));
AppendLog(new[]
{
fileInfo.Name,
ConvertLogTimeToISO8601(line),
"player-left",
userDisplayName
userInfo.DisplayName,
userInfo.UserId
});
return true;
@@ -1285,6 +1289,26 @@ namespace VRCX
return new string[][] { };
}
private static (string DisplayName, string UserId) ParseUserInfo(string userInfo)
{
string userDisplayName;
string userId;
int pos = userInfo.LastIndexOf(" (");
if (pos >= 0)
{
userDisplayName = userInfo.Substring(0, pos);
userId = userInfo.Substring(pos + 2, userInfo.LastIndexOf(')') - (pos + 3));
}
else
{
userDisplayName = userInfo;
userId = null;
}
return (userDisplayName, userId);
}
private class LogContext
{
public bool AudioDeviceChanged;

2
html/src/app.js
View File

@@ -11245,7 +11245,7 @@ speechSynthesis.getVoices();
var joinTime = Date.parse(gameLog.dt);
var userMap = {
displayName: gameLog.displayName,
userId,
userId : gameLog.userId,
joinTime,
lastAvatar: ''
};

2
html/src/service/gamelog.js
View File

@@ -19,10 +19,12 @@ class GameLogService {
case 'player-joined':
gameLog.displayName = args[0];
gameLog.userId = args[1];
break;
case 'player-left':
gameLog.displayName = args[0];
gameLog.userId = args[1];
break;
case 'notification':