* update the requesting client version from 12.26.1.0 to 12.66.1.0 following b372f22 to fix lumina37/aiotieba#216 (comment) @ derived classes of BaseCrawler<,>

n0099 · n0099 · commit f2672e9e2ca8 · 2024-08-10T05:41:32.000Z
* fix lumina37/aiotieba#216 (comment) @ `ReplyCrawlFacade.OnPostParse()` @ crawler * update path of protoBuf codegen files @ TbClient.csproj @ tbclient @ c# $ git submodule update --remote
diff --git a/c#/crawler/src/Tieba/Crawl/Crawler/ReplyCrawler.cs b/c#/crawler/src/Tieba/Crawl/Crawler/ReplyCrawler.cs
@@ -32,7 +32,7 @@ public override IReadOnlyCollection<Reply> GetValidPosts(ReplyResponse response,
     protected override int GetResponseErrorCode(ReplyResponse response) => response.Error.Errorno;
     protected override IEnumerable<Request> GetRequestsForPage(Page page, CancellationToken stoppingToken = default) =>
     [
-        new(Requester.RequestProtoBuf("c/f/pb/page?cmd=302001", "12.26.1.0",
+        new(Requester.RequestProtoBuf("c/f/pb/page?cmd=302001", "12.66.1.0",
             new ReplyRequest {Data = new()
             { // reverse order will be {"last", "1"}, {"r", "1"}
                 Kz = (long)tid,
diff --git a/c#/crawler/src/Tieba/Crawl/Crawler/SubReplyCrawler.cs b/c#/crawler/src/Tieba/Crawl/Crawler/SubReplyCrawler.cs
@@ -33,7 +33,7 @@ public override IReadOnlyCollection<SubReply> GetValidPosts(SubReplyResponse res
     protected override int GetResponseErrorCode(SubReplyResponse response) => response.Error.Errorno;
     protected override IEnumerable<Request> GetRequestsForPage(Page page, CancellationToken stoppingToken = default) =>
     [
-        new(Requester.RequestProtoBuf("c/f/pb/floor?cmd=302002", "12.26.1.0",
+        new(Requester.RequestProtoBuf("c/f/pb/floor?cmd=302002", "12.66.1.0",
             new SubReplyRequest {Data = new()
             {
                 Kz = (long)tid,
diff --git a/c#/crawler/src/Tieba/Crawl/Crawler/ThreadCrawler.cs b/c#/crawler/src/Tieba/Crawl/Crawler/ThreadCrawler.cs
@@ -37,7 +37,7 @@ protected override IEnumerable<Request> GetRequestsForPage(Page page, Cancellati
         };
         return
         [
-            new(Requester.RequestProtoBuf(EndPointUrl, "12.26.1.0",
+            new(Requester.RequestProtoBuf(EndPointUrl, "12.66.1.0",
                 new ThreadRequest {Data = data},
                 (req, common) => req.Data.Common = common,
                 () => new ThreadResponse(), stoppingToken)),
diff --git a/c#/crawler/src/Tieba/Crawl/Facade/ReplyCrawlFacade.cs b/c#/crawler/src/Tieba/Crawl/Facade/ReplyCrawlFacade.cs
@@ -26,7 +26,7 @@ protected override void OnPostParse(
     {
         parsedPosts.Values.ForEach(r => r.Tid = tid);
         var data = response.Data;
-        UserParser.Parse(data.UserList);
+        UserParser.Parse(data.UserList.Where(u => !(u.LevelId == 0 && u.AlaInfo.LiveStatus != 0)));
         if (data.Page.CurrentPage == 1)
             _parentThreadTitle = data.PostList.FirstOrDefault(r => r.Floor == 1)?.Title;
     }
diff --git a/c#/tbClient/TbClient.csproj b/c#/tbClient/TbClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <Compile Include="..\..\tbclient.protobuf\tbm_cs\**" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+        <Compile Include="..\..\tbclient.protobuf\tbm_csharp\**" Link="%(RecursiveDir)%(Filename)%(Extension)" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Google.Protobuf" Version="3.27.3" />
diff --git a/tbclient.protobuf b/tbclient.protobuf
@@ -1 +1 @@
-Subproject commit 7ebe461d60a24e336b930697f98cd6e3321a2aca
+Subproject commit 31383157abcfbaefcdc8dfffac1e296da2ca0f0e

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public override IReadOnlyCollection<Reply> GetValidPosts(ReplyResponse response,`
`32`	`32`	`protected override int GetResponseErrorCode(ReplyResponse response) => response.Error.Errorno;`
`33`	`33`	`protected override IEnumerable<Request> GetRequestsForPage(Page page, CancellationToken stoppingToken = default) =>`
`34`	`34`	`[`
`35`		`- new(Requester.RequestProtoBuf("c/f/pb/page?cmd=302001", "12.26.1.0",`
	`35`	`+ new(Requester.RequestProtoBuf("c/f/pb/page?cmd=302001", "12.66.1.0",`
`36`	`36`	`new ReplyRequest {Data = new()`
`37`	`37`	`{ // reverse order will be {"last", "1"}, {"r", "1"}`
`38`	`38`	`Kz = (long)tid,`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public override IReadOnlyCollection<SubReply> GetValidPosts(SubReplyResponse res`
`33`	`33`	`protected override int GetResponseErrorCode(SubReplyResponse response) => response.Error.Errorno;`
`34`	`34`	`protected override IEnumerable<Request> GetRequestsForPage(Page page, CancellationToken stoppingToken = default) =>`
`35`	`35`	`[`
`36`		`- new(Requester.RequestProtoBuf("c/f/pb/floor?cmd=302002", "12.26.1.0",`
	`36`	`+ new(Requester.RequestProtoBuf("c/f/pb/floor?cmd=302002", "12.66.1.0",`
`37`	`37`	`new SubReplyRequest {Data = new()`
`38`	`38`	`{`
`39`	`39`	`Kz = (long)tid,`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected override IEnumerable<Request> GetRequestsForPage(Page page, Cancellati`
`37`	`37`	`};`
`38`	`38`	`return`
`39`	`39`	`[`
`40`		`- new(Requester.RequestProtoBuf(EndPointUrl, "12.26.1.0",`
	`40`	`+ new(Requester.RequestProtoBuf(EndPointUrl, "12.66.1.0",`
`41`	`41`	`new ThreadRequest {Data = data},`
`42`	`42`	`(req, common) => req.Data.Common = common,`
`43`	`43`	`() => new ThreadResponse(), stoppingToken)),`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected override void OnPostParse(`
`26`	`26`	`{`
`27`	`27`	`parsedPosts.Values.ForEach(r => r.Tid = tid);`
`28`	`28`	`var data = response.Data;`
`29`		`- UserParser.Parse(data.UserList);`
	`29`	`+ UserParser.Parse(data.UserList.Where(u => !(u.LevelId == 0 && u.AlaInfo.LiveStatus != 0)));`
`30`	`30`	`if (data.Page.CurrentPage == 1)`
`31`	`31`	`_parentThreadTitle = data.PostList.FirstOrDefault(r => r.Floor == 1)?.Title;`
`32`	`32`	`}`