エラーログから艦隊名などの情報を削除する

diff --git a/KancolleSniffer.Test/ErrorLogTest.cs b/KancolleSniffer.Test/ErrorLogTest.cs
index 222df1f..913dd91 100644 (file)
--- a/KancolleSniffer.Test/ErrorLogTest.cs
+++ b/KancolleSniffer.Test/ErrorLogTest.cs
@@ -37,19 +37,25 @@ namespace KancolleSniffer.Test
             var request4 = "api%5Ftoken=0123456abcdef";\r
             ErrorLog.RemoveUnwantedInformation(ref request4, ref response);\r
             PAssert.That(() => request4 == "", "トークン単独");\r
+            var request5 = "api%5Fbtime=83026279&api%5Ftoken=b936475084b75920aa646d2a609b23cf3838bbc1&api%5Fverno=1";\r
+            ErrorLog.RemoveUnwantedInformation(ref request5, ref response);\r
+            PAssert.That(() => request5 == "api%5Fverno=1", "戦闘APIの時刻印を削除");\r
         }\r
 \r
         [TestMethod]\r
         public void RemoveUnwantedInformationFromResponse()\r
         {\r
             var request = "";\r
-            var response = @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":" +\r
+            var response1 = @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":" +\r
                            @"{""api_basic"":{""api_member_id"":""123456""," +\r
                            @"""api_nickname"":""ぱんなこった"",""api_nickname_id"":""12345678"",""api_active_flag"":1}}}";\r
-            ErrorLog.RemoveUnwantedInformation(ref request, ref response);\r
-            PAssert.That(() => response ==\r
-                               @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":" +\r
-                               @"{""api_basic"":{""api_active_flag"":1}}}");\r
+            ErrorLog.RemoveUnwantedInformation(ref request, ref response1);\r
+            PAssert.That(() => response1 ==\r
+                               @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":{""api_basic"":{""api_active_flag"":1}}}");\r
+            var response2 =\r
+                @"{""api_deck_data"":[{""api_member_id"":123456,""api_id"":1,""api_name"":""第一艦隊"",""api_name_id"":""123456"",""api_mission"":[0,0,0,0],""api_flagship"":""0""}]}";\r
+            ErrorLog.RemoveUnwantedInformation(ref request, ref response2);\r
+            PAssert.That(() => response2 == @"{""api_deck_data"":[{""api_id"":1,""api_name"":"""",""api_mission"":[0,0,0,0],""api_flagship"":""0""}]}");\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/ErrorLog.cs b/KancolleSniffer/ErrorLog.cs
index 1134980..afaf507 100644 (file)
--- a/KancolleSniffer/ErrorLog.cs
+++ b/KancolleSniffer/ErrorLog.cs
@@ -110,10 +110,12 @@ namespace KancolleSniffer
 \r
         public static void RemoveUnwantedInformation(ref string request, ref string response)\r
         {\r
-            var token = new Regex("&api%5Ftoken=.+?(?=&|$)|api%5Ftoken=.+?(?:&|$)");\r
+            var token = new Regex(@"&api%5Ftoken=.+?(?=&|$)|api%5Ftoken=.+?(?:&|$)|api%5Fbtime=\d+&?");\r
             request = token.Replace(request, "");\r
-            var id = new Regex(@"""api_member_id"":""\d+?"",?|""api_nickname"":"".+?"",?|""api_nickname_id"":""\d+"",?");\r
+            var id = new Regex(@"""api_member_id"":""?\d+""?,?|""api_nickname"":"".+?"",?|""api_nickname_id"":""\d+"",?|""api_name_id"":"".+?"",?|");\r
             response = id.Replace(response, "");\r
+            var name = new Regex(@"""api_name"":"".+?""");\r
+            response = name.Replace(response, @"""api_name"":""""");\r
         }\r
 \r
         private string CompressApi(string api)\r