From 3513debeb35f6d52704112f460dec5bf0e77862d Mon Sep 17 00:00:00 2001 From: n0099 Date: Fri, 19 May 2023 21:03:33 +0800 Subject: [PATCH] - field `ReplyRequest.is_fold_comment_req` and `ReplyResponse.has_fold_comment` due to https://github.com/Starry-OvO/aiotieba/issues/123#issuecomment-1554505671 @ tbm & interested --- interested/Api/Request/ReplyRequest.proto | 1 - tbm/Api/Request/ReplyRequest.proto | 1 - tbm_cs/Api/Request/ReplyRequest.g.cs | 46 ++----------------- .../GPBMetadata/Api/Request/ReplyRequest.php | 9 ++-- .../Api/Request/ReplyRequest/Data.php | 27 ----------- 5 files changed, 8 insertions(+), 76 deletions(-) diff --git a/interested/Api/Request/ReplyRequest.proto b/interested/Api/Request/ReplyRequest.proto index 9842a0323..65151199b 100644 --- a/interested/Api/Request/ReplyRequest.proto +++ b/interested/Api/Request/ReplyRequest.proto @@ -14,7 +14,6 @@ message ReplyRequest { Common common = 25; int32 is_jumpfloor = 34; int32 jumpfloor_num = 35; - int32 is_fold_comment_req = 78; }; Data data = 1; } diff --git a/tbm/Api/Request/ReplyRequest.proto b/tbm/Api/Request/ReplyRequest.proto index 37becdb59..cc33ee9db 100644 --- a/tbm/Api/Request/ReplyRequest.proto +++ b/tbm/Api/Request/ReplyRequest.proto @@ -8,7 +8,6 @@ message ReplyRequest { int32 rn = 13; int32 pn = 18; Common common = 25; - int32 is_fold_comment_req = 78; }; Data data = 1; } diff --git a/tbm_cs/Api/Request/ReplyRequest.g.cs b/tbm_cs/Api/Request/ReplyRequest.g.cs index 1510bb0c3..a16c38813 100644 --- a/tbm_cs/Api/Request/ReplyRequest.g.cs +++ b/tbm_cs/Api/Request/ReplyRequest.g.cs @@ -25,16 +25,15 @@ static ReplyRequestReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Ch5BcGkvUmVxdWVzdC9SZXBseVJlcXVlc3QucHJvdG8SFHRiQ2xpZW50LmFw", - "aS5yZXF1ZXN0GhhBcGkvUmVxdWVzdC9Db21tb24ucHJvdG8ivAEKDFJlcGx5", + "aS5yZXF1ZXN0GhhBcGkvUmVxdWVzdC9Db21tb24ucHJvdG8inwEKDFJlcGx5", "UmVxdWVzdBI1CgRkYXRhGAEgASgLMicudGJDbGllbnQuYXBpLnJlcXVlc3Qu", - "UmVwbHlSZXF1ZXN0LkRhdGEadQoERGF0YRIKCgJrehgEIAEoAxIKCgJybhgN", + "UmVwbHlSZXF1ZXN0LkRhdGEaWAoERGF0YRIKCgJrehgEIAEoAxIKCgJybhgN", "IAEoBRIKCgJwbhgSIAEoBRIsCgZjb21tb24YGSABKAsyHC50YkNsaWVudC5h", - "cGkucmVxdWVzdC5Db21tb24SGwoTaXNfZm9sZF9jb21tZW50X3JlcRhOIAEo", - "BWIGcHJvdG8z")); + "cGkucmVxdWVzdC5Db21tb25iBnByb3RvMw==")); 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", "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" }, null, null, null, null)}) })); } #endregion @@ -280,7 +279,6 @@ public Data(Data other) : this() { rn_ = other.rn_; pn_ = other.pn_; common_ = other.common_ != null ? other.common_.Clone() : null; - isFoldCommentReq_ = other.isFoldCommentReq_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -338,18 +336,6 @@ public int Pn { } } - /// Field number for the "is_fold_comment_req" field. - public const int IsFoldCommentReqFieldNumber = 78; - private int isFoldCommentReq_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int IsFoldCommentReq { - get { return isFoldCommentReq_; } - set { - isFoldCommentReq_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -369,7 +355,6 @@ public bool Equals(Data other) { if (Rn != other.Rn) return false; if (Pn != other.Pn) return false; if (!object.Equals(Common, other.Common)) return false; - if (IsFoldCommentReq != other.IsFoldCommentReq) return false; return Equals(_unknownFields, other._unknownFields); } @@ -381,7 +366,6 @@ public override int GetHashCode() { if (Rn != 0) hash ^= Rn.GetHashCode(); if (Pn != 0) hash ^= Pn.GetHashCode(); if (common_ != null) hash ^= Common.GetHashCode(); - if (IsFoldCommentReq != 0) hash ^= IsFoldCommentReq.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -416,10 +400,6 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(202, 1); output.WriteMessage(Common); } - if (IsFoldCommentReq != 0) { - output.WriteRawTag(240, 4); - output.WriteInt32(IsFoldCommentReq); - } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -446,10 +426,6 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(202, 1); output.WriteMessage(Common); } - if (IsFoldCommentReq != 0) { - output.WriteRawTag(240, 4); - output.WriteInt32(IsFoldCommentReq); - } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -472,9 +448,6 @@ public int CalculateSize() { if (common_ != null) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(Common); } - if (IsFoldCommentReq != 0) { - size += 2 + pb::CodedOutputStream.ComputeInt32Size(IsFoldCommentReq); - } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -502,9 +475,6 @@ public void MergeFrom(Data other) { } Common.MergeFrom(other.Common); } - if (other.IsFoldCommentReq != 0) { - IsFoldCommentReq = other.IsFoldCommentReq; - } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -539,10 +509,6 @@ public void MergeFrom(pb::CodedInputStream input) { input.ReadMessage(Common); break; } - case 624: { - IsFoldCommentReq = input.ReadInt32(); - break; - } } } #endif @@ -577,10 +543,6 @@ public void MergeFrom(pb::CodedInputStream input) { input.ReadMessage(Common); break; } - case 624: { - IsFoldCommentReq = input.ReadInt32(); - break; - } } } } diff --git a/tbm_php/GPBMetadata/Api/Request/ReplyRequest.php b/tbm_php/GPBMetadata/Api/Request/ReplyRequest.php index e6669c3a4..17bc9ec08 100644 --- a/tbm_php/GPBMetadata/Api/Request/ReplyRequest.php +++ b/tbm_php/GPBMetadata/Api/Request/ReplyRequest.php @@ -17,10 +17,10 @@ public static function initOnce() { \GPBMetadata\Api\Request\Common::initOnce(); $pool->internalAddGeneratedFile( ' -ý -Api/Request/ReplyRequest.prototbClient.api.request"¼ +à +Api/Request/ReplyRequest.prototbClient.api.request"Ÿ ReplyRequest5 -data ( 2\'.tbClient.api.request.ReplyRequest.Datau +data ( 2\'.tbClient.api.request.ReplyRequest.DataX Data kz ( @@ -28,8 +28,7 @@ public static function initOnce() { rn ( pn (, -common ( 2.tbClient.api.request.Common -is_fold_comment_reqN (bproto3' +common ( 2.tbClient.api.request.Commonbproto3' , true); static::$is_initialized = true; diff --git a/tbm_php/TbClient/Api/Request/ReplyRequest/Data.php b/tbm_php/TbClient/Api/Request/ReplyRequest/Data.php index d9c8d88ee..27e7ffb1e 100644 --- a/tbm_php/TbClient/Api/Request/ReplyRequest/Data.php +++ b/tbm_php/TbClient/Api/Request/ReplyRequest/Data.php @@ -29,10 +29,6 @@ class Data extends \Google\Protobuf\Internal\Message * Generated from protobuf field .tbClient.api.request.Common common = 25; */ protected $common = null; - /** - * Generated from protobuf field int32 is_fold_comment_req = 78; - */ - protected $is_fold_comment_req = 0; /** * Constructor. @@ -44,7 +40,6 @@ class Data extends \Google\Protobuf\Internal\Message * @type int $rn * @type int $pn * @type \TbClient\Api\Request\Common $common - * @type int $is_fold_comment_req * } */ public function __construct($data = NULL) { @@ -150,28 +145,6 @@ public function setCommon($var) return $this; } - /** - * Generated from protobuf field int32 is_fold_comment_req = 78; - * @return int - */ - public function getIsFoldCommentReq() - { - return $this->is_fold_comment_req; - } - - /** - * Generated from protobuf field int32 is_fold_comment_req = 78; - * @param int $var - * @return $this - */ - public function setIsFoldCommentReq($var) - { - GPBUtil::checkInt32($var); - $this->is_fold_comment_req = $var; - - return $this; - } - } // Adding a class alias for backwards compatibility with the previous class name.