From d844f4c0d47110ac510215ca137af168a468fef9 Mon Sep 17 00:00:00 2001 From: cleantted Date: Fri, 5 Feb 2021 01:16:21 +0900 Subject: [PATCH] =?UTF-8?q?VRChat=202021.1.2=E3=81=AE=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=81=A7=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=81=8C=E5=A3=8A=E3=82=8C=E3=81=9F=E4=B8=8D=E5=85=B7=E5=90=88?= =?UTF-8?q?=E3=81=AE=E6=9A=AB=E5=AE=9A=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VRChatActivityLogger/RegexPatterns.cs | 12 ++++++------ .../VRChatActivityLogger/VRChatActivityLogger.cs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/VRChatActivityLogger/VRChatActivityLogger/RegexPatterns.cs b/VRChatActivityLogger/VRChatActivityLogger/RegexPatterns.cs index 520c77c..d8a5a42 100644 --- a/VRChatActivityLogger/VRChatActivityLogger/RegexPatterns.cs +++ b/VRChatActivityLogger/VRChatActivityLogger/RegexPatterns.cs @@ -51,9 +51,9 @@ static RegexPatterns() string receivedRequestInvite = header + @"Received Message of type: notification content:.+""type"":""requestInvite"".+$"; string sendInvite = header + @"Send notification:.+type:invite.+$"; string sendRequestInvite = header + @"Send notification:.+type:requestInvite.+$"; - string joinedRoom1 = header + @"\[RoomManager\] Joining w.+$"; - string joinedRoom2 = header + @"\[RoomManager\] Joining or Creating Room:.+$"; - string metPlayer = header + @"\[Player\] Initialized PlayerAPI.+$"; + string joinedRoom1 = header + @"\[(RoomManager|[DŽDž]*)\] Joining w.+$"; + string joinedRoom2 = header + @"\[(RoomManager|[DŽDž]*)\] Joining or Creating Room:.+$"; + string metPlayer = header + @"\[(Player|[DŽDž]*)\] Initialized PlayerAPI.+$"; string sendFriendRequest = header + @"Send notification:.+type:friendRequest.+$"; string receivedFriendRequest = header + @"Received Message of type: notification content:.+""type"":""friendRequest"".+$"; string acceptFriendRequest = header + @"AcceptFriendRequest.+$"; @@ -79,9 +79,9 @@ static RegexPatterns() string receivedRequestInviteDetail = detailHeader + @"Received Message of type: notification content: ({{.+}}) received at"; string sendInviteDetail = detailHeader + @".+to (.{40}) of.+worldId=(.+), worldName=(.+)}},"; string sendRequestInviteDetail = detailHeader + @".+to (.{40}) of"; - string metPlayerDetail = detailHeader + @"\[Player\] Initialized PlayerAPI ""(.*)"" is (remote|local)$"; - string joinedRoom1Detail = detailHeader + @"\[RoomManager\] Joining (.+)$"; - string joinedRoom2Detail = detailHeader + @"\[RoomManager\] Joining or Creating Room: (.+)$"; + string metPlayerDetail = detailHeader + @"\[(Player|[DŽDž]*)\] Initialized PlayerAPI ""(.*)"" is (remote|local)$"; + string joinedRoom1Detail = detailHeader + @"\[(RoomManager|[DŽDž]*)\] Joining (.+)$"; + string joinedRoom2Detail = detailHeader + @"\[(RoomManager|[DŽDž]*)\] Joining or Creating Room: (.+)$"; string sendFriendRequestDetail = detailHeader + @".+to (.{40}) of"; string receivedFriendRequestDetail = detailHeader + @"Received Message of type: notification content: ({{.+}}) received at"; string acceptFriendRequestDetail = detailHeader + @".+username:(.+), sender user id:(.{40}).+id: (.{40}),"; diff --git a/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.cs b/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.cs index 9104688..187a7cd 100644 --- a/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.cs +++ b/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.cs @@ -211,7 +211,7 @@ private List ParseVRChatLog(string filePath) { ActivityType = ActivityType.JoinedRoom, Timestamp = DateTime.Parse(m.Groups[1].Value), - WorldID = m.Groups[2].Value, + WorldID = m.Groups[3].Value, }); } else if (match.Groups[PatternType.JoinedRoom2].Value.Length != 0) @@ -219,7 +219,7 @@ private List ParseVRChatLog(string filePath) var m = RegexPatterns.JoinedRoom2Detail.Match(match.ToString()); if (activityLogs.Any() && activityLogs[activityLogs.Count - 1].ActivityType == ActivityType.JoinedRoom) { - activityLogs[activityLogs.Count - 1].WorldName = m.Groups[2].Value; + activityLogs[activityLogs.Count - 1].WorldName = m.Groups[3].Value; } else { @@ -238,7 +238,7 @@ private List ParseVRChatLog(string filePath) { ActivityType = ActivityType.MetPlayer, Timestamp = DateTime.Parse(m.Groups[1].Value), - UserName = m.Groups[2].Value, + UserName = m.Groups[3].Value, }); } else if (match.Groups[PatternType.SendFriendRequest].Value.Length != 0)