- field (Thread|Reply)Request.q_type since lumina37/aiotieba#123 @ …

…tbm & interested
n0099 · May 19, 2023 · b4941a8 · b4941a8
1 parent c5e6d0e
commit b4941a8
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 154 deletions.
diff --git a/interested/Api/Request/ReplyRequest.proto b/interested/Api/Request/ReplyRequest.proto
@@ -10,7 +10,6 @@ message ReplyRequest {
         int32 floor_rn = 9;
         int32 floor_sort_type = 74;
         int32 rn = 13;
-        int32 q_type = 17;
         int32 pn = 18;
         Common common = 25;
         int32 is_jumpfloor = 34;

diff --git a/interested/Api/Request/ThreadRequest.proto b/interested/Api/Request/ThreadRequest.proto
@@ -10,7 +10,6 @@ message ThreadRequest {
         int32 is_good = 4;
         int32 with_group = 8;
         int32 frs_rn = 10;
-        int32 q_type = 14;
         int32 pn = 15;
         int32 result_num = 22;
         int64 user_id = 31;

diff --git a/tbm/Api/Request/ReplyRequest.proto b/tbm/Api/Request/ReplyRequest.proto
@@ -6,7 +6,6 @@ message ReplyRequest {
     message Data {
         int64 kz = 4;
         int32 rn = 13;
-        int32 q_type = 17;
         int32 pn = 18;
         Common common = 25;
         int32 is_fold_comment_req = 78;

diff --git a/tbm/Api/Request/ThreadRequest.proto b/tbm/Api/Request/ThreadRequest.proto
@@ -7,7 +7,6 @@ message ThreadRequest {
         string kw = 1;
         int32 rn = 2;
         int32 rn_need = 3;
-        int32 q_type = 14;
         int32 pn = 15;
         Common common = 39;
         int32 sort_type = 47;

diff --git a/tbm_cs/Api/Request/ReplyRequest.g.cs b/tbm_cs/Api/Request/ReplyRequest.g.cs
@@ -25,16 +25,16 @@ static ReplyRequestReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Ch5BcGkvUmVxdWVzdC9SZXBseVJlcXVlc3QucHJvdG8SFHRiQ2xpZW50LmFw",
-            "aS5yZXF1ZXN0GhhBcGkvUmVxdWVzdC9Db21tb24ucHJvdG8izQEKDFJlcGx5",
+            "aS5yZXF1ZXN0GhhBcGkvUmVxdWVzdC9Db21tb24ucHJvdG8ivAEKDFJlcGx5",
             "UmVxdWVzdBI1CgRkYXRhGAEgASgLMicudGJDbGllbnQuYXBpLnJlcXVlc3Qu",
-            "UmVwbHlSZXF1ZXN0LkRhdGEahQEKBERhdGESCgoCa3oYBCABKAMSCgoCcm4Y",
-            "DSABKAUSDgoGcV90eXBlGBEgASgFEgoKAnBuGBIgASgFEiwKBmNvbW1vbhgZ",
-            "IAEoCzIcLnRiQ2xpZW50LmFwaS5yZXF1ZXN0LkNvbW1vbhIbChNpc19mb2xk",
-            "X2NvbW1lbnRfcmVxGE4gASgFYgZwcm90bzM="));
+            "UmVwbHlSZXF1ZXN0LkRhdGEadQoERGF0YRIKCgJrehgEIAEoAxIKCgJybhgN",
+            "IAEoBRIKCgJwbhgSIAEoBRIsCgZjb21tb24YGSABKAsyHC50YkNsaWVudC5h",
+            "cGkucmVxdWVzdC5Db21tb24SGwoTaXNfZm9sZF9jb21tZW50X3JlcRhOIAEo",
+            "BWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::TbClient.Api.Request.CommonReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ReplyRequest), global::TbClient.Api.Request.ReplyRequest.Parser, new[]{ "Data" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ReplyRequest.Types.Data), global::TbClient.Api.Request.ReplyRequest.Types.Data.Parser, new[]{ "Kz", "Rn", "QType", "Pn", "Common", "IsFoldCommentReq" }, null, null, null, null)})
+            new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ReplyRequest), global::TbClient.Api.Request.ReplyRequest.Parser, new[]{ "Data" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ReplyRequest.Types.Data), global::TbClient.Api.Request.ReplyRequest.Types.Data.Parser, new[]{ "Kz", "Rn", "Pn", "Common", "IsFoldCommentReq" }, null, null, null, null)})
           }));
     }
     #endregion
@@ -278,7 +278,6 @@ public Data() {
         public Data(Data other) : this() {
           kz_ = other.kz_;
           rn_ = other.rn_;
-          qType_ = other.qType_;
           pn_ = other.pn_;
           common_ = other.common_ != null ? other.common_.Clone() : null;
           isFoldCommentReq_ = other.isFoldCommentReq_;
@@ -315,18 +314,6 @@ public int Rn {
           }
         }
 
-        /// <summary>Field number for the "q_type" field.</summary>
-        public const int QTypeFieldNumber = 17;
-        private int qType_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int QType {
-          get { return qType_; }
-          set {
-            qType_ = value;
-          }
-        }
-
         /// <summary>Field number for the "pn" field.</summary>
         public const int PnFieldNumber = 18;
         private int pn_;
@@ -380,7 +367,6 @@ public bool Equals(Data other) {
           }
           if (Kz != other.Kz) return false;
           if (Rn != other.Rn) return false;
-          if (QType != other.QType) return false;
           if (Pn != other.Pn) return false;
           if (!object.Equals(Common, other.Common)) return false;
           if (IsFoldCommentReq != other.IsFoldCommentReq) return false;
@@ -393,7 +379,6 @@ public override int GetHashCode() {
           int hash = 1;
           if (Kz != 0L) hash ^= Kz.GetHashCode();
           if (Rn != 0) hash ^= Rn.GetHashCode();
-          if (QType != 0) hash ^= QType.GetHashCode();
           if (Pn != 0) hash ^= Pn.GetHashCode();
           if (common_ != null) hash ^= Common.GetHashCode();
           if (IsFoldCommentReq != 0) hash ^= IsFoldCommentReq.GetHashCode();
@@ -423,10 +408,6 @@ public void WriteTo(pb::CodedOutputStream output) {
             output.WriteRawTag(104);
             output.WriteInt32(Rn);
           }
-          if (QType != 0) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(QType);
-          }
           if (Pn != 0) {
             output.WriteRawTag(144, 1);
             output.WriteInt32(Pn);
@@ -457,10 +438,6 @@ public void WriteTo(pb::CodedOutputStream output) {
             output.WriteRawTag(104);
             output.WriteInt32(Rn);
           }
-          if (QType != 0) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(QType);
-          }
           if (Pn != 0) {
             output.WriteRawTag(144, 1);
             output.WriteInt32(Pn);
@@ -489,9 +466,6 @@ public int CalculateSize() {
           if (Rn != 0) {
             size += 1 + pb::CodedOutputStream.ComputeInt32Size(Rn);
           }
-          if (QType != 0) {
-            size += 2 + pb::CodedOutputStream.ComputeInt32Size(QType);
-          }
           if (Pn != 0) {
             size += 2 + pb::CodedOutputStream.ComputeInt32Size(Pn);
           }
@@ -519,9 +493,6 @@ public void MergeFrom(Data other) {
           if (other.Rn != 0) {
             Rn = other.Rn;
           }
-          if (other.QType != 0) {
-            QType = other.QType;
-          }
           if (other.Pn != 0) {
             Pn = other.Pn;
           }
@@ -557,10 +528,6 @@ public void MergeFrom(pb::CodedInputStream input) {
                 Rn = input.ReadInt32();
                 break;
               }
-              case 136: {
-                QType = input.ReadInt32();
-                break;
-              }
               case 144: {
                 Pn = input.ReadInt32();
                 break;
@@ -599,10 +566,6 @@ public void MergeFrom(pb::CodedInputStream input) {
                 Rn = input.ReadInt32();
                 break;
               }
-              case 136: {
-                QType = input.ReadInt32();
-                break;
-              }
               case 144: {
                 Pn = input.ReadInt32();
                 break;

diff --git a/tbm_cs/Api/Request/ThreadRequest.g.cs b/tbm_cs/Api/Request/ThreadRequest.g.cs
@@ -25,16 +25,16 @@ static ThreadRequestReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Ch9BcGkvUmVxdWVzdC9UaHJlYWRSZXF1ZXN0LnByb3RvEhR0YkNsaWVudC5h",
-            "cGkucmVxdWVzdBoYQXBpL1JlcXVlc3QvQ29tbW9uLnByb3RvItYBCg1UaHJl",
+            "cGkucmVxdWVzdBoYQXBpL1JlcXVlc3QvQ29tbW9uLnByb3RvIsUBCg1UaHJl",
             "YWRSZXF1ZXN0EjYKBGRhdGEYASABKAsyKC50YkNsaWVudC5hcGkucmVxdWVz",
-            "dC5UaHJlYWRSZXF1ZXN0LkRhdGEajAEKBERhdGESCgoCa3cYASABKAkSCgoC",
-            "cm4YAiABKAUSDwoHcm5fbmVlZBgDIAEoBRIOCgZxX3R5cGUYDiABKAUSCgoC",
-            "cG4YDyABKAUSLAoGY29tbW9uGCcgASgLMhwudGJDbGllbnQuYXBpLnJlcXVl",
-            "c3QuQ29tbW9uEhEKCXNvcnRfdHlwZRgvIAEoBWIGcHJvdG8z"));
+            "dC5UaHJlYWRSZXF1ZXN0LkRhdGEafAoERGF0YRIKCgJrdxgBIAEoCRIKCgJy",
+            "bhgCIAEoBRIPCgdybl9uZWVkGAMgASgFEgoKAnBuGA8gASgFEiwKBmNvbW1v",
+            "bhgnIAEoCzIcLnRiQ2xpZW50LmFwaS5yZXF1ZXN0LkNvbW1vbhIRCglzb3J0",
+            "X3R5cGUYLyABKAViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::TbClient.Api.Request.CommonReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ThreadRequest), global::TbClient.Api.Request.ThreadRequest.Parser, new[]{ "Data" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ThreadRequest.Types.Data), global::TbClient.Api.Request.ThreadRequest.Types.Data.Parser, new[]{ "Kw", "Rn", "RnNeed", "QType", "Pn", "Common", "SortType" }, null, null, null, null)})
+            new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ThreadRequest), global::TbClient.Api.Request.ThreadRequest.Parser, new[]{ "Data" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.ThreadRequest.Types.Data), global::TbClient.Api.Request.ThreadRequest.Types.Data.Parser, new[]{ "Kw", "Rn", "RnNeed", "Pn", "Common", "SortType" }, null, null, null, null)})
           }));
     }
     #endregion
@@ -279,7 +279,6 @@ public Data(Data other) : this() {
           kw_ = other.kw_;
           rn_ = other.rn_;
           rnNeed_ = other.rnNeed_;
-          qType_ = other.qType_;
           pn_ = other.pn_;
           common_ = other.common_ != null ? other.common_.Clone() : null;
           sortType_ = other.sortType_;
@@ -328,18 +327,6 @@ public int RnNeed {
           }
         }
 
-        /// <summary>Field number for the "q_type" field.</summary>
-        public const int QTypeFieldNumber = 14;
-        private int qType_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int QType {
-          get { return qType_; }
-          set {
-            qType_ = value;
-          }
-        }
-
         /// <summary>Field number for the "pn" field.</summary>
         public const int PnFieldNumber = 15;
         private int pn_;
@@ -394,7 +381,6 @@ public bool Equals(Data other) {
           if (Kw != other.Kw) return false;
           if (Rn != other.Rn) return false;
           if (RnNeed != other.RnNeed) return false;
-          if (QType != other.QType) return false;
           if (Pn != other.Pn) return false;
           if (!object.Equals(Common, other.Common)) return false;
           if (SortType != other.SortType) return false;
@@ -408,7 +394,6 @@ public override int GetHashCode() {
           if (Kw.Length != 0) hash ^= Kw.GetHashCode();
           if (Rn != 0) hash ^= Rn.GetHashCode();
           if (RnNeed != 0) hash ^= RnNeed.GetHashCode();
-          if (QType != 0) hash ^= QType.GetHashCode();
           if (Pn != 0) hash ^= Pn.GetHashCode();
           if (common_ != null) hash ^= Common.GetHashCode();
           if (SortType != 0) hash ^= SortType.GetHashCode();
@@ -442,10 +427,6 @@ public void WriteTo(pb::CodedOutputStream output) {
             output.WriteRawTag(24);
             output.WriteInt32(RnNeed);
           }
-          if (QType != 0) {
-            output.WriteRawTag(112);
-            output.WriteInt32(QType);
-          }
           if (Pn != 0) {
             output.WriteRawTag(120);
             output.WriteInt32(Pn);
@@ -480,10 +461,6 @@ public void WriteTo(pb::CodedOutputStream output) {
             output.WriteRawTag(24);
             output.WriteInt32(RnNeed);
           }
-          if (QType != 0) {
-            output.WriteRawTag(112);
-            output.WriteInt32(QType);
-          }
           if (Pn != 0) {
             output.WriteRawTag(120);
             output.WriteInt32(Pn);
@@ -515,9 +492,6 @@ public int CalculateSize() {
           if (RnNeed != 0) {
             size += 1 + pb::CodedOutputStream.ComputeInt32Size(RnNeed);
           }
-          if (QType != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(QType);
-          }
           if (Pn != 0) {
             size += 1 + pb::CodedOutputStream.ComputeInt32Size(Pn);
           }
@@ -548,9 +522,6 @@ public void MergeFrom(Data other) {
           if (other.RnNeed != 0) {
             RnNeed = other.RnNeed;
           }
-          if (other.QType != 0) {
-            QType = other.QType;
-          }
           if (other.Pn != 0) {
             Pn = other.Pn;
           }
@@ -590,10 +561,6 @@ public void MergeFrom(pb::CodedInputStream input) {
                 RnNeed = input.ReadInt32();
                 break;
               }
-              case 112: {
-                QType = input.ReadInt32();
-                break;
-              }
               case 120: {
                 Pn = input.ReadInt32();
                 break;
@@ -636,10 +603,6 @@ public void MergeFrom(pb::CodedInputStream input) {
                 RnNeed = input.ReadInt32();
                 break;
               }
-              case 112: {
-                QType = input.ReadInt32();
-                break;
-              }
               case 120: {
                 Pn = input.ReadInt32();
                 break;

diff --git a/tbm_php/GPBMetadata/Api/Request/ReplyRequest.php b/tbm_php/GPBMetadata/Api/Request/ReplyRequest.php
diff --git a/tbm_php/GPBMetadata/Api/Request/ThreadRequest.php b/tbm_php/GPBMetadata/Api/Request/ThreadRequest.php
diff --git a/tbm_php/TbClient/Api/Request/ReplyRequest/Data.php b/tbm_php/TbClient/Api/Request/ReplyRequest/Data.php