Merge branch 'master' into feature/#8

nukora · Feb 27, 2021 · 9637b3e · 9637b3e
2 parents 677e5bc + e474a30
commit 9637b3e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/VRChatActivityLogger/VRChatActivityLogger/RegexPatterns.cs b/VRChatActivityLogger/VRChatActivityLogger/RegexPatterns.cs
@@ -55,9 +55,9 @@ static RegexPatterns()
             string receivedRequestInvite = header + @"Received Notification:.+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|[Ǆǅ]*|Behaviour)\] Joining w.+$";
+            string joinedRoom2 = header + @"\[(RoomManager|[Ǆǅ]*|Behaviour)\] Joining or Creating Room:.+$";
+            string metPlayer = header + @"\[(Player|[Ǆǅ]*|Behaviour)\] Initialized PlayerAPI.+$";
             string sendFriendRequest = header + @"Send notification:.+type:friendRequest,.+$";
             string receivedFriendRequest = header + @"Received Notification:.+type:friendRequest,.+$";
             string acceptFriendRequest = header + @"AcceptFriendRequest.+$";
@@ -88,9 +88,9 @@ static RegexPatterns()
             string receivedRequestInviteDetail = detailHeader + @"Received Notification: <Notification from username:(.+), sender user id:(.{40}).+ of type: requestInvite, id: (.{40}),.+{{(requestMessage=(.+?))?,? ?(imageUrl=(.+?))??}}, type:requestInvite,.+$";
             string sendInviteDetail = detailHeader + @"Send notification:.+sender user.+ to (.{40}).+worldId=([^,]+),.+worldName=(.+?)(, messageSlot=.+)?}}, type:invite,.+message: ""(.+)?"".+$";
             string sendRequestInviteDetail = detailHeader + @"Send notification:.+sender user.+ to (.{40}).+type:requestInvite,.+message: ""(.+)?"".+$";
-            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|[Ǆǅ]*|Behaviour)\] Initialized PlayerAPI ""(.*)"" is (remote|local)$";
+            string joinedRoom1Detail = detailHeader + @"\[(RoomManager|[Ǆǅ]*|Behaviour)\] Joining (.+)$";
+            string joinedRoom2Detail = detailHeader + @"\[(RoomManager|[Ǆǅ]*|Behaviour)\] Joining or Creating Room: (.+)$";
             string sendFriendRequestDetail = detailHeader + @"Send notification:.+sender user.+ to (.{40}).+type:friendRequest,.+$";
             string receivedFriendRequestDetail = detailHeader + @"Received Notification: <Notification from username:(.+), sender user id:(.{40}).+ of type: friendRequest, id: (.{40}),.+type:friendRequest,.+$";
             string acceptFriendRequestDetail = detailHeader + @"AcceptFriendRequest Notification:<Notification from username:(.+), sender user id:(.{40}).+ of type: friendRequest, id: (.{40}),.+type:friendRequest,.+$";

diff --git a/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.cs b/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.cs
@@ -268,7 +268,7 @@ private List<ActivityLog> ParseVRChatLog(string filePath)
                             {
                                 ActivityType = ActivityType.JoinedRoom,
                                 Timestamp = DateTime.Parse(m.Groups[1].Value),
-                                WorldName = m.Groups[2].Value,
+                                WorldName = m.Groups[3].Value,
                             });
                         }
                     }

diff --git a/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.csproj b/VRChatActivityLogger/VRChatActivityLogger/VRChatActivityLogger.csproj
@@ -6,7 +6,7 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <ApplicationIcon />
     <StartupObject />
-    <Version>1.1.2</Version>
+    <Version>1.1.3</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">