From 6d9400a64c854a8252f8369ae16ee688576affa8 Mon Sep 17 00:00:00 2001 From: Natsumi Date: Wed, 8 Dec 2021 06:43:31 +1300 Subject: [PATCH] Fix U+031F funnies --- LogWatcher.cs | 20 +++++++------------- html/src/service/gamelog.js | 1 - 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/LogWatcher.cs b/LogWatcher.cs index 75aa33a0..e10681bd 100644 --- a/LogWatcher.cs +++ b/LogWatcher.cs @@ -406,35 +406,29 @@ namespace VRCX // 2021.06.23 11:41:16 Log - [Behaviour] Initialized PlayerAPI "Natsumi-sama" is local - if (line.Contains("] Initialized PlayerAPI \"")) + if (line.Contains("] OnPlayerJoined")) { - var lineOffset = line.LastIndexOf("] Initialized PlayerAPI \""); + var lineOffset = line.LastIndexOf("] OnPlayerJoined"); if (lineOffset < 0) return false; - lineOffset += 25; + lineOffset += 17; - var pos = line.LastIndexOf("\" is "); - if (pos < 0) - return false; - - var userType = line.Substring(pos + 5); - var userDisplayName = line.Substring(lineOffset, pos - lineOffset); + var userDisplayName = line.Substring(lineOffset); AppendLog(new[] { fileInfo.Name, ConvertLogTimeToISO8601(line), "player-joined", - userDisplayName, - userType, + userDisplayName }); return true; } - if (line.Contains("] OnPlayerLeft ")) + if (line.Contains("] OnPlayerLeft") && !line.Contains("] OnPlayerLeftRoom")) { - var lineOffset = line.LastIndexOf("] OnPlayerLeft "); + var lineOffset = line.LastIndexOf("] OnPlayerLeft"); if (lineOffset < 0) return false; lineOffset += 15; diff --git a/html/src/service/gamelog.js b/html/src/service/gamelog.js index a167f908..df81fba3 100644 --- a/html/src/service/gamelog.js +++ b/html/src/service/gamelog.js @@ -19,7 +19,6 @@ class GameLogService { case 'player-joined': gameLog.userDisplayName = args[0]; - gameLog.userType = args[1]; break; case 'player-left':