Merge pull request #254 from lumina37/develop

Update 4.5.1
lumina37 · Jan 11, 2025 · 6da9847 · 6da9847
2 parents 92fe0f1 + 0df5d4c
commit 6da9847
Show file tree

Hide file tree

Showing 210 changed files with 2,145 additions and 1,804 deletions.
diff --git a/.github/workflows/CI-beta.yml b/.github/workflows/CI-beta.yml
@@ -25,7 +25,9 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Setup UV
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
+        with:
+          cache-dependency-glob: "pyproject.toml"
 
       - name: Install dependencies
         run: uv sync

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -35,7 +35,9 @@ jobs:
           ref: develop
 
       - name: Setup UV
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
+        with:
+          cache-dependency-glob: "pyproject.toml"
 
       - name: Install dependencies
         run: uv sync -p ${{ matrix.python-version }}

diff --git a/.github/workflows/Pages.yml b/.github/workflows/Pages.yml
@@ -27,7 +27,7 @@ jobs:
           ref: develop
 
       - name: Setup UV
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
 
       - name: Install dependencies
         run: uv sync --only-dev

diff --git a/aiotieba/__init__.py b/aiotieba/__init__.py
@@ -16,7 +16,7 @@
 from .enums import *  # noqa: F403
 from .logging import enable_filelog, get_logger
 
-if os.name == 'posix':
+if os.name == "posix":
     import signal
 
     def terminate(signal_number, frame):

diff --git a/aiotieba/api/_classdef/common.py b/aiotieba/api/_classdef/common.py
@@ -2,4 +2,4 @@
 
 from google.protobuf.message import Message
 
-TypeMessage = TypeVar('TypeMessage', bound=Message)
+TypeMessage = TypeVar("TypeMessage", bound=Message)
diff --git a/aiotieba/api/_classdef/container.py b/aiotieba/api/_classdef/container.py
@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 import dataclasses as dcs
-from collections.abc import Iterator
-from typing import Generic, SupportsIndex, TypeVar, overload
+from typing import TYPE_CHECKING, Generic, SupportsIndex, TypeVar, overload
 
-TypeContainer = TypeVar('TypeContainer')
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+TypeContainer = TypeVar("TypeContainer")
 
 
 @dcs.dataclass

diff --git a/aiotieba/api/_classdef/contents.py b/aiotieba/api/_classdef/contents.py
@@ -3,13 +3,14 @@
 import dataclasses as dcs
 import re
 from functools import cached_property
-from typing import Protocol, TypeVar
+from typing import TYPE_CHECKING, Protocol, TypeVar
 
 import yarl
 
-from .common import TypeMessage
+if TYPE_CHECKING:
+    from .common import TypeMessage
 
-TypeFragment = TypeVar('TypeFragment')
+TypeFragment = TypeVar("TypeFragment")
 
 
 @dcs.dataclass
@@ -58,7 +59,7 @@ class TypeFragEmoji(Protocol):
     desc: str
 
 
-_IMAGEHASH_EXP = re.compile(r'/([a-z0-9]{32,})\.')
+_IMAGEHASH_EXP = re.compile(r"/([a-z0-9]{32,})\.")
 
 
 @dcs.dataclass
@@ -91,7 +92,7 @@ def from_tbdata(data_proto: TypeMessage) -> FragImage:
         origin_src = data_proto.origin_src
         origin_size = data_proto.origin_size
 
-        show_width, _, show_height = data_proto.bsize.partition(',')
+        show_width, _, show_height = data_proto.bsize.partition(",")
         show_width = int(show_width)
         show_height = int(show_height)
 
@@ -231,7 +232,7 @@ def from_tbdata(data_proto: TypeMessage) -> FragLink:
     @cached_property
     def url(self) -> yarl.URL:
         if self.is_external:
-            url = yarl.URL(self.raw_url.query['url'])
+            url = yarl.URL(self.raw_url.query["url"])
         else:
             url = self.raw_url
         return url

diff --git a/aiotieba/api/_classdef/user.py b/aiotieba/api/_classdef/user.py
@@ -42,10 +42,10 @@ class UserInfo:
     """
 
     user_id: int = 0
-    portrait: str = ''
-    user_name: str = ''
-    nick_name_old: str = ''
-    nick_name_new: str = ''
+    portrait: str = ""
+    user_name: str = ""
+    nick_name_old: str = ""
+    nick_name_new: str = ""
     tieba_uid: int = 0
 
     glevel: int = 0
@@ -57,7 +57,7 @@ class UserInfo:
     follow_num: int = 0
     forum_num: int = 0
     sign: str = ""
-    ip: str = ''
+    ip: str = ""
     icons: list[str] = dcs.field(default_factory=list)
 
     is_vip: bool = False

diff --git a/aiotieba/api/_classdef/vote.py b/aiotieba/api/_classdef/vote.py
@@ -1,8 +1,10 @@
 from __future__ import annotations
 
 import dataclasses as dcs
+from typing import TYPE_CHECKING
 
-from .common import TypeMessage
+if TYPE_CHECKING:
+    from .common import TypeMessage
 
 
 @dcs.dataclass

diff --git a/aiotieba/api/_protobuf/Agree_pb2.py b/aiotieba/api/_protobuf/Agree_pb2.py
@@ -14,8 +14,8 @@
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'Agree_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "Agree_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_AGREE']._serialized_start = 15
-    _globals['_AGREE']._serialized_end = 63
+    _globals["_AGREE"]._serialized_start = 15
+    _globals["_AGREE"]._serialized_end = 63
diff --git a/aiotieba/api/_protobuf/CommonReq_pb2.py b/aiotieba/api/_protobuf/CommonReq_pb2.py
@@ -9,13 +9,13 @@
 
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-    b'\n\x0f\x43ommonReq.proto"\xc6\x06\n\tCommonReq\x12\x14\n\x0c_client_type\x18\x01 \x01(\x05\x12\x17\n\x0f_client_version\x18\x02 \x01(\t\x12\x12\n\n_client_id\x18\x03 \x01(\t\x12\x13\n\x0b_phone_imei\x18\x05 \x01(\t\x12\r\n\x05_from\x18\x06 \x01(\t\x12\x0c\n\x04\x63uid\x18\x07 \x01(\t\x12\x12\n\n_timestamp\x18\x08 \x01(\x03\x12\r\n\x05model\x18\t \x01(\t\x12\r\n\x05\x42\x44USS\x18\n \x01(\t\x12\x0b\n\x03tbs\x18\x0b \x01(\t\x12\x10\n\x08net_type\x18\x0c \x01(\x05\x12\x10\n\x08pversion\x18\x18 \x01(\t\x12\x13\n\x0b_os_version\x18\x19 \x01(\t\x12\r\n\x05\x62rand\x18\x1a \x01(\t\x12\x18\n\x10lego_lib_version\x18\x1c \x01(\t\x12\x0f\n\x07\x61pplist\x18\x1d \x01(\t\x12\x0e\n\x06stoken\x18\x1e \x01(\t\x12\x0c\n\x04z_id\x18\x1f \x01(\t\x12\x14\n\x0c\x63uid_galaxy2\x18  \x01(\t\x12\x10\n\x08\x63uid_gid\x18! \x01(\t\x12\x0e\n\x06\x63\x33_aid\x18# \x01(\t\x12\x11\n\tsample_id\x18$ \x01(\t\x12\r\n\x05scr_w\x18% \x01(\x05\x12\r\n\x05scr_h\x18& \x01(\x05\x12\x0f\n\x07scr_dip\x18\' \x01(\x01\x12\x0e\n\x06q_type\x18( \x01(\x05\x12\x13\n\x0bis_teenager\x18) \x01(\x05\x12\x0f\n\x07sdk_ver\x18* \x01(\t\x12\x15\n\rframework_ver\x18+ \x01(\t\x12\x15\n\rnaws_game_ver\x18, \x01(\t\x12\x18\n\x10\x61\x63tive_timestamp\x18\x31 \x01(\x03\x12\x1a\n\x12\x66irst_install_time\x18\x32 \x01(\x03\x12\x18\n\x10last_update_time\x18\x33 \x01(\x03\x12\x11\n\tevent_day\x18\x35 \x01(\t\x12\x12\n\nandroid_id\x18\x36 \x01(\t\x12\r\n\x05\x63mode\x18\x37 \x01(\x05\x12\x14\n\x0cstart_scheme\x18\x38 \x01(\t\x12\x12\n\nstart_type\x18\x39 \x01(\x05\x12\x0c\n\x04idfv\x18< \x01(\t\x12\r\n\x05\x65xtra\x18= \x01(\t\x12\x12\n\nuser_agent\x18> \x01(\t\x12\x1f\n\x17personalized_rec_switch\x18? \x01(\x05\x12\x14\n\x0c\x64\x65vice_score\x18\x46 \x01(\tb\x06proto3'
+    b"\n\x0f\x43ommonReq.proto\"\xc6\x06\n\tCommonReq\x12\x14\n\x0c_client_type\x18\x01 \x01(\x05\x12\x17\n\x0f_client_version\x18\x02 \x01(\t\x12\x12\n\n_client_id\x18\x03 \x01(\t\x12\x13\n\x0b_phone_imei\x18\x05 \x01(\t\x12\r\n\x05_from\x18\x06 \x01(\t\x12\x0c\n\x04\x63uid\x18\x07 \x01(\t\x12\x12\n\n_timestamp\x18\x08 \x01(\x03\x12\r\n\x05model\x18\t \x01(\t\x12\r\n\x05\x42\x44USS\x18\n \x01(\t\x12\x0b\n\x03tbs\x18\x0b \x01(\t\x12\x10\n\x08net_type\x18\x0c \x01(\x05\x12\x10\n\x08pversion\x18\x18 \x01(\t\x12\x13\n\x0b_os_version\x18\x19 \x01(\t\x12\r\n\x05\x62rand\x18\x1a \x01(\t\x12\x18\n\x10lego_lib_version\x18\x1c \x01(\t\x12\x0f\n\x07\x61pplist\x18\x1d \x01(\t\x12\x0e\n\x06stoken\x18\x1e \x01(\t\x12\x0c\n\x04z_id\x18\x1f \x01(\t\x12\x14\n\x0c\x63uid_galaxy2\x18  \x01(\t\x12\x10\n\x08\x63uid_gid\x18! \x01(\t\x12\x0e\n\x06\x63\x33_aid\x18# \x01(\t\x12\x11\n\tsample_id\x18$ \x01(\t\x12\r\n\x05scr_w\x18% \x01(\x05\x12\r\n\x05scr_h\x18& \x01(\x05\x12\x0f\n\x07scr_dip\x18' \x01(\x01\x12\x0e\n\x06q_type\x18( \x01(\x05\x12\x13\n\x0bis_teenager\x18) \x01(\x05\x12\x0f\n\x07sdk_ver\x18* \x01(\t\x12\x15\n\rframework_ver\x18+ \x01(\t\x12\x15\n\rnaws_game_ver\x18, \x01(\t\x12\x18\n\x10\x61\x63tive_timestamp\x18\x31 \x01(\x03\x12\x1a\n\x12\x66irst_install_time\x18\x32 \x01(\x03\x12\x18\n\x10last_update_time\x18\x33 \x01(\x03\x12\x11\n\tevent_day\x18\x35 \x01(\t\x12\x12\n\nandroid_id\x18\x36 \x01(\t\x12\r\n\x05\x63mode\x18\x37 \x01(\x05\x12\x14\n\x0cstart_scheme\x18\x38 \x01(\t\x12\x12\n\nstart_type\x18\x39 \x01(\x05\x12\x0c\n\x04idfv\x18< \x01(\t\x12\r\n\x05\x65xtra\x18= \x01(\t\x12\x12\n\nuser_agent\x18> \x01(\t\x12\x1f\n\x17personalized_rec_switch\x18? \x01(\x05\x12\x14\n\x0c\x64\x65vice_score\x18\x46 \x01(\tb\x06proto3"
 )
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'CommonReq_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "CommonReq_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_COMMONREQ']._serialized_start = 20
-    _globals['_COMMONREQ']._serialized_end = 858
+    _globals["_COMMONREQ"]._serialized_start = 20
+    _globals["_COMMONREQ"]._serialized_end = 858
diff --git a/aiotieba/api/_protobuf/Error_pb2.py b/aiotieba/api/_protobuf/Error_pb2.py
@@ -14,8 +14,8 @@
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'Error_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "Error_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_ERROR']._serialized_start = 15
-    _globals['_ERROR']._serialized_end = 55
+    _globals["_ERROR"]._serialized_start = 15
+    _globals["_ERROR"]._serialized_end = 55
diff --git a/aiotieba/api/_protobuf/ForumList_pb2.py b/aiotieba/api/_protobuf/ForumList_pb2.py
@@ -14,8 +14,8 @@
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ForumList_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "ForumList_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_FORUMLIST']._serialized_start = 19
-    _globals['_FORUMLIST']._serialized_end = 128
+    _globals["_FORUMLIST"]._serialized_start = 19
+    _globals["_FORUMLIST"]._serialized_end = 128
diff --git a/aiotieba/api/_protobuf/FrsTabInfo_pb2.py b/aiotieba/api/_protobuf/FrsTabInfo_pb2.py
@@ -14,8 +14,8 @@
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'FrsTabInfo_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "FrsTabInfo_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_FRSTABINFO']._serialized_start = 20
-    _globals['_FRSTABINFO']._serialized_end = 66
+    _globals["_FRSTABINFO"]._serialized_start = 20
+    _globals["_FRSTABINFO"]._serialized_end = 66
diff --git a/aiotieba/api/_protobuf/Media_pb2.py b/aiotieba/api/_protobuf/Media_pb2.py
@@ -14,8 +14,8 @@
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'Media_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "Media_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_MEDIA']._serialized_start = 16
-    _globals['_MEDIA']._serialized_end = 164
+    _globals["_MEDIA"]._serialized_start = 16
+    _globals["_MEDIA"]._serialized_end = 164
diff --git a/aiotieba/api/_protobuf/Page_pb2.py b/aiotieba/api/_protobuf/Page_pb2.py
@@ -14,8 +14,8 @@
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'Page_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "Page_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_PAGE']._serialized_start = 14
-    _globals['_PAGE']._serialized_end = 138
+    _globals["_PAGE"]._serialized_start = 14
+    _globals["_PAGE"]._serialized_end = 138
diff --git a/aiotieba/api/_protobuf/PbContent_pb2.py b/aiotieba/api/_protobuf/PbContent_pb2.py
@@ -14,12 +14,12 @@
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'PbContent_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "PbContent_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_PBCONTENT']._serialized_start = 20
-    _globals['_PBCONTENT']._serialized_end = 611
-    _globals['_PBCONTENT_TIEBAPLUSINFO']._serialized_start = 374
-    _globals['_PBCONTENT_TIEBAPLUSINFO']._serialized_end = 584
-    _globals['_PBCONTENT_ITEM']._serialized_start = 586
-    _globals['_PBCONTENT_ITEM']._serialized_end = 611
+    _globals["_PBCONTENT"]._serialized_start = 20
+    _globals["_PBCONTENT"]._serialized_end = 611
+    _globals["_PBCONTENT_TIEBAPLUSINFO"]._serialized_start = 374
+    _globals["_PBCONTENT_TIEBAPLUSINFO"]._serialized_end = 584
+    _globals["_PBCONTENT_ITEM"]._serialized_start = 586
+    _globals["_PBCONTENT_ITEM"]._serialized_end = 611
diff --git a/aiotieba/api/_protobuf/PollInfo_pb2.py b/aiotieba/api/_protobuf/PollInfo_pb2.py
@@ -9,15 +9,15 @@
 
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-    b'\n\x0ePollInfo.proto"\xa2\x01\n\x08PollInfo\x12\x10\n\x08is_multi\x18\x02 \x01(\x05\x12\x11\n\ttotal_num\x18\x03 \x01(\x03\x12%\n\x07options\x18\t \x03(\x0b\x32\x14.PollInfo.PollOption\x12\x12\n\ntotal_poll\x18\x0b \x01(\x03\x12\r\n\x05title\x18\x0c \x01(\t\x1a\'\n\nPollOption\x12\x0b\n\x03num\x18\x02 \x01(\x03\x12\x0c\n\x04text\x18\x03 \x01(\tb\x06proto3'
+    b"\n\x0ePollInfo.proto\"\xa2\x01\n\x08PollInfo\x12\x10\n\x08is_multi\x18\x02 \x01(\x05\x12\x11\n\ttotal_num\x18\x03 \x01(\x03\x12%\n\x07options\x18\t \x03(\x0b\x32\x14.PollInfo.PollOption\x12\x12\n\ntotal_poll\x18\x0b \x01(\x03\x12\r\n\x05title\x18\x0c \x01(\t\x1a'\n\nPollOption\x12\x0b\n\x03num\x18\x02 \x01(\x03\x12\x0c\n\x04text\x18\x03 \x01(\tb\x06proto3"
 )
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'PollInfo_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "PollInfo_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_POLLINFO']._serialized_start = 19
-    _globals['_POLLINFO']._serialized_end = 181
-    _globals['_POLLINFO_POLLOPTION']._serialized_start = 142
-    _globals['_POLLINFO_POLLOPTION']._serialized_end = 181
+    _globals["_POLLINFO"]._serialized_start = 19
+    _globals["_POLLINFO"]._serialized_end = 181
+    _globals["_POLLINFO_POLLOPTION"]._serialized_start = 142
+    _globals["_POLLINFO_POLLOPTION"]._serialized_end = 181
diff --git a/aiotieba/api/_protobuf/PostInfoList_pb2.py b/aiotieba/api/_protobuf/PostInfoList_pb2.py
@@ -16,17 +16,17 @@
 from . import Voice_pb2 as Voice__pb2
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-    b'\n\x12PostInfoList.proto\x1a\x0bMedia.proto\x1a\x0bVoice.proto\x1a\x0ePollInfo.proto\x1a\x0fVideoInfo.proto\x1a\x0fPbContent.proto\x1a\x0b\x41gree.proto"\xf9\x05\n\x0cPostInfoList\x12\x10\n\x08\x66orum_id\x18\x01 \x01(\x04\x12\x11\n\tthread_id\x18\x02 \x01(\x04\x12\x0f\n\x07post_id\x18\x03 \x01(\x04\x12\x13\n\x0b\x63reate_time\x18\x05 \x01(\r\x12\x12\n\nforum_name\x18\x06 \x01(\t\x12\r\n\x05title\x18\x07 \x01(\t\x12.\n\x07\x63ontent\x18\x08 \x03(\x0b\x32\x1d.PostInfoList.PostInfoContent\x12\x11\n\tuser_name\x18\n \x01(\t\x12\x15\n\x05media\x18\x10 \x03(\x0b\x32\x06.Media\x12\x11\n\treply_num\x18\x11 \x01(\r\x12\x0f\n\x07user_id\x18\x12 \x01(\x03\x12\x15\n\ruser_portrait\x18\x13 \x01(\t\x12\x1a\n\nvoice_info\x18\x17 \x03(\x0b\x32\x06.Voice\x12\x13\n\x0bthread_type\x18\x1a \x01(\x04\x12\x1c\n\tpoll_info\x18\x1c \x01(\x0b\x32\t.PollInfo\x12\x1e\n\nvideo_info\x18\x1d \x01(\x0b\x32\n.VideoInfo\x12\x10\n\x08\x66req_num\x18! \x01(\x05\x12\x11\n\tname_show\x18# \x01(\t\x12\x11\n\tshare_num\x18\' \x01(\x05\x12\x15\n\x05\x61gree\x18( \x01(\x0b\x32\x06.Agree\x12\x17\n\x0fis_share_thread\x18, \x01(\x05\x12&\n\x12\x66irst_post_content\x18\x31 \x03(\x0b\x32\n.PbContent\x1a\xe6\x01\n\x0fPostInfoContent\x12<\n\x0cpost_content\x18\x01 \x03(\x0b\x32&.PostInfoList.PostInfoContent.Abstract\x12\x13\n\x0b\x63reate_time\x18\x02 \x01(\x04\x12\x11\n\tpost_type\x18\x03 \x01(\x04\x12\x0f\n\x07post_id\x18\x04 \x01(\x04\x1a\\\n\x08\x41\x62stract\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0c\n\x04text\x18\x02 \x01(\t\x12\x0c\n\x04link\x18\x03 \x01(\t\x12\x13\n\x0b\x64uring_time\x18\x06 \x01(\t\x12\x11\n\tvoice_md5\x18\x07 \x01(\tb\x06proto3'
+    b"\n\x12PostInfoList.proto\x1a\x0bMedia.proto\x1a\x0bVoice.proto\x1a\x0ePollInfo.proto\x1a\x0fVideoInfo.proto\x1a\x0fPbContent.proto\x1a\x0b\x41gree.proto\"\xf9\x05\n\x0cPostInfoList\x12\x10\n\x08\x66orum_id\x18\x01 \x01(\x04\x12\x11\n\tthread_id\x18\x02 \x01(\x04\x12\x0f\n\x07post_id\x18\x03 \x01(\x04\x12\x13\n\x0b\x63reate_time\x18\x05 \x01(\r\x12\x12\n\nforum_name\x18\x06 \x01(\t\x12\r\n\x05title\x18\x07 \x01(\t\x12.\n\x07\x63ontent\x18\x08 \x03(\x0b\x32\x1d.PostInfoList.PostInfoContent\x12\x11\n\tuser_name\x18\n \x01(\t\x12\x15\n\x05media\x18\x10 \x03(\x0b\x32\x06.Media\x12\x11\n\treply_num\x18\x11 \x01(\r\x12\x0f\n\x07user_id\x18\x12 \x01(\x03\x12\x15\n\ruser_portrait\x18\x13 \x01(\t\x12\x1a\n\nvoice_info\x18\x17 \x03(\x0b\x32\x06.Voice\x12\x13\n\x0bthread_type\x18\x1a \x01(\x04\x12\x1c\n\tpoll_info\x18\x1c \x01(\x0b\x32\t.PollInfo\x12\x1e\n\nvideo_info\x18\x1d \x01(\x0b\x32\n.VideoInfo\x12\x10\n\x08\x66req_num\x18! \x01(\x05\x12\x11\n\tname_show\x18# \x01(\t\x12\x11\n\tshare_num\x18' \x01(\x05\x12\x15\n\x05\x61gree\x18( \x01(\x0b\x32\x06.Agree\x12\x17\n\x0fis_share_thread\x18, \x01(\x05\x12&\n\x12\x66irst_post_content\x18\x31 \x03(\x0b\x32\n.PbContent\x1a\xe6\x01\n\x0fPostInfoContent\x12<\n\x0cpost_content\x18\x01 \x03(\x0b\x32&.PostInfoList.PostInfoContent.Abstract\x12\x13\n\x0b\x63reate_time\x18\x02 \x01(\x04\x12\x11\n\tpost_type\x18\x03 \x01(\x04\x12\x0f\n\x07post_id\x18\x04 \x01(\x04\x1a\\\n\x08\x41\x62stract\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0c\n\x04text\x18\x02 \x01(\t\x12\x0c\n\x04link\x18\x03 \x01(\t\x12\x13\n\x0b\x64uring_time\x18\x06 \x01(\t\x12\x11\n\tvoice_md5\x18\x07 \x01(\tb\x06proto3"
 )
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'PostInfoList_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "PostInfoList_pb2", _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
     DESCRIPTOR._loaded_options = None
-    _globals['_POSTINFOLIST']._serialized_start = 112
-    _globals['_POSTINFOLIST']._serialized_end = 873
-    _globals['_POSTINFOLIST_POSTINFOCONTENT']._serialized_start = 643
-    _globals['_POSTINFOLIST_POSTINFOCONTENT']._serialized_end = 873
-    _globals['_POSTINFOLIST_POSTINFOCONTENT_ABSTRACT']._serialized_start = 781
-    _globals['_POSTINFOLIST_POSTINFOCONTENT_ABSTRACT']._serialized_end = 873
+    _globals["_POSTINFOLIST"]._serialized_start = 112
+    _globals["_POSTINFOLIST"]._serialized_end = 873
+    _globals["_POSTINFOLIST_POSTINFOCONTENT"]._serialized_start = 643
+    _globals["_POSTINFOLIST_POSTINFOCONTENT"]._serialized_end = 873
+    _globals["_POSTINFOLIST_POSTINFOCONTENT_ABSTRACT"]._serialized_start = 781
+    _globals["_POSTINFOLIST_POSTINFOCONTENT_ABSTRACT"]._serialized_end = 873
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		from google.protobuf.message import Message

		TypeMessage = TypeVar('TypeMessage', bound=Message)
		TypeMessage = TypeVar("TypeMessage", bound=Message)