From ce23a67b5916b670f1f79b71f028edbbd8898566 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Thu, 2 Jan 2020 16:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=8E=BB=E6=B5=8B=E8=AF=95=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- XiguaUser_pb2.py | 466 +++++++++++++++++++++++++++++++---------------- api.py | 16 +- 2 files changed, 318 insertions(+), 164 deletions(-) diff --git a/XiguaUser_pb2.py b/XiguaUser_pb2.py index 02f574b..c4ca08a 100644 --- a/XiguaUser_pb2.py +++ b/XiguaUser_pb2.py @@ -18,7 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='', syntax='proto2', serialized_options=None, - serialized_pb=b'\n\x0fXiguaUser.proto\"\x1f\n\x08UserPack\x12\x13\n\x04user\x18\x01 \x02(\x0b\x32\x05.User\"\x96\x07\n\x04User\x12\n\n\x02id\x18\x01 \x02(\x03\x12\x10\n\x08nickname\x18\x03 \x02(\t\x12\x0e\n\x06gender\x18\x04 \x02(\x05\x12!\n\x0b\x61vatarThumb\x18\t \x02(\x0b\x32\x0c.User.Avatar\x12\"\n\x0c\x61vatarMedium\x18\n \x01(\x0b\x32\x0c.User.Avatar\x12!\n\x0b\x61vatarLarge\x18\x0b \x01(\x0b\x32\x0c.User.Avatar\x12\x1a\n\x05\x62\x61\x64ge\x18\x15 \x03(\x0b\x32\x0b.User.Badge\x12\x1c\n\x06\x66ollow\x18\x16 \x01(\x0b\x32\x0c.User.Follow\x12 \n\x08payGrade\x18\x17 \x02(\x0b\x32\x0e.User.PayGrade\x12\x11\n\ttotalPaid\x18\" \x02(\x05\x1a!\n\x06\x41vatar\x12\x0b\n\x03url\x18\x01 \x02(\t\x12\n\n\x02id\x18\x02 \x01(\t\x1a\xcd\x01\n\x05\x42\x61\x64ge\x12\x0b\n\x03url\x18\x01 \x03(\t\x12\x10\n\x08localUrl\x18\x02 \x01(\t\x12\x0e\n\x06height\x18\x03 \x01(\x05\x12\r\n\x05width\x18\x04 \x01(\x05\x12\x0c\n\x04type\x18\x06 \x01(\x05\x12\x0f\n\x07\x63lickTo\x18\x07 \x01(\t\x12,\n\x0b\x66\x61nClubText\x18\x08 \x01(\x0b\x32\x17.User.Badge.FanClubText\x1a\x39\n\x0b\x46\x61nClubText\x12\x0c\n\x04text\x18\x01 \x02(\t\x12\r\n\x05\x63olor\x18\x02 \x01(\t\x12\r\n\x05level\x18\x03 \x02(\x05\x1a\x33\n\x06\x46ollow\x12\x14\n\tfollowing\x18\x01 \x01(\x05:\x01\x30\x12\x13\n\x08\x66ollower\x18\x02 \x01(\x05:\x01\x30\x1a\xa1\x01\n\x08PayGrade\x12\x0f\n\x07\x63urrent\x18\x01 \x02(\x05\x12\r\n\x05level\x18\x06 \x02(\x05\x12\x18\n\x10\x63urrentLevelNeed\x18\n \x01(\x05\x12\x15\n\rnextLevelNeed\x18\x0b \x01(\x05\x12\x0f\n\x07\x63ontent\x18\r \x01(\t\x12\x1a\n\x05\x62\x61\x64ge\x18\x13 \x02(\x0b\x32\x0b.User.Badge\x12\x17\n\x0ftoNextLevelNeed\x18\x15 \x01(\x05\x1a(\n\nHonorLevel\x12\x1a\n\x05\x62\x61\x64ge\x18\x13 \x02(\x0b\x32\x0b.User.Badge\x1a\x90\x01\n\x05Noble\x12\x0f\n\x07\x63ontent\x18\x04 \x02(\t\x12)\n\x07\x62oarder\x18\x08 \x01(\x0b\x32\x18.User.Noble.NobleBoarder\x1aK\n\x0cNobleBoarder\x12\x0f\n\x07urlList\x18\x01 \x03(\t\x12\x0b\n\x03uri\x18\x02 \x02(\t\x12\x0e\n\x06height\x18\x03 \x01(\x05\x12\r\n\x05width\x18\x04 \x01(\x05' + serialized_pb=b'\n\x0fXiguaUser.proto\"\x1f\n\x08UserPack\x12\x13\n\x04user\x18\x01 \x02(\x0b\x32\x05.User\"\xc8\x01\n\x05\x42\x61\x64ge\x12\x0b\n\x03url\x18\x01 \x03(\t\x12\x10\n\x08localUrl\x18\x02 \x01(\t\x12\x0e\n\x06height\x18\x03 \x01(\x05\x12\r\n\x05width\x18\x04 \x01(\x05\x12\x0c\n\x04type\x18\x06 \x01(\x05\x12\x0f\n\x07\x63lickTo\x18\x07 \x01(\t\x12\'\n\x0b\x66\x61nClubText\x18\x08 \x01(\x0b\x32\x12.Badge.FanClubText\x1a\x39\n\x0b\x46\x61nClubText\x12\x0c\n\x04text\x18\x01 \x02(\t\x12\r\n\x05\x63olor\x18\x02 \x01(\t\x12\r\n\x05level\x18\x03 \x02(\x05\";\n\x11\x46\x61nsClubBadgePack\x12\x15\n\x05\x62\x61\x64ge\x18\x01 \x02(\x0b\x32\x06.Badge\x12\x0f\n\x05title\x18\x02 \x01(\t:\x00\"\xa0\x01\n\x0c\x46\x61nsClubPack\x12(\n\x08\x66\x61nsClub\x18\x01 \x02(\x0b\x32\x16.FansClubPack.FansClub\x1a\x66\n\x08\x46\x61nsClub\x12\x0f\n\x05title\x18\x01 \x02(\t:\x00\x12\x10\n\x05level\x18\x02 \x02(\x05:\x01\x30\x12\x10\n\x08someEnum\x18\x03 \x01(\x05\x12%\n\tfansClubs\x18\x04 \x02(\x0b\x32\x12.FansClubBadgePack\"\xd8\x05\n\x04User\x12\n\n\x02id\x18\x01 \x02(\x03\x12\x10\n\x08nickname\x18\x03 \x02(\t\x12\x0e\n\x06gender\x18\x04 \x02(\x05\x12!\n\x0b\x61vatarThumb\x18\t \x02(\x0b\x32\x0c.User.Avatar\x12\"\n\x0c\x61vatarMedium\x18\n \x01(\x0b\x32\x0c.User.Avatar\x12!\n\x0b\x61vatarLarge\x18\x0b \x01(\x0b\x32\x0c.User.Avatar\x12\x15\n\x05\x62\x61\x64ge\x18\x15 \x03(\x0b\x32\x06.Badge\x12\x1c\n\x06\x66ollow\x18\x16 \x01(\x0b\x32\x0c.User.Follow\x12 \n\x08payGrade\x18\x17 \x02(\x0b\x32\x0e.User.PayGrade\x12\x1f\n\x08\x66\x61nsClub\x18\x18 \x02(\x0b\x32\r.FansClubPack\x12\x11\n\ttotalPaid\x18\" \x02(\x05\x1a!\n\x06\x41vatar\x12\x0b\n\x03url\x18\x01 \x02(\t\x12\n\n\x02id\x18\x02 \x01(\t\x1a\x33\n\x06\x46ollow\x12\x14\n\tfollowing\x18\x01 \x01(\x05:\x01\x30\x12\x13\n\x08\x66ollower\x18\x02 \x01(\x05:\x01\x30\x1a\x9c\x01\n\x08PayGrade\x12\x0f\n\x07\x63urrent\x18\x01 \x02(\x05\x12\r\n\x05level\x18\x06 \x02(\x05\x12\x18\n\x10\x63urrentLevelNeed\x18\n \x01(\x05\x12\x15\n\rnextLevelNeed\x18\x0b \x01(\x05\x12\x0f\n\x07\x63ontent\x18\r \x01(\t\x12\x15\n\x05\x62\x61\x64ge\x18\x13 \x02(\x0b\x32\x06.Badge\x12\x17\n\x0ftoNextLevelNeed\x18\x15 \x01(\x05\x1a#\n\nHonorLevel\x12\x15\n\x05\x62\x61\x64ge\x18\x13 \x02(\x0b\x32\x06.Badge\x1a\x90\x01\n\x05Noble\x12\x0f\n\x07\x63ontent\x18\x04 \x02(\t\x12)\n\x07\x62oarder\x18\x08 \x01(\x0b\x32\x18.User.Noble.NobleBoarder\x1aK\n\x0cNobleBoarder\x12\x0f\n\x07urlList\x18\x01 \x03(\t\x12\x0b\n\x03uri\x18\x02 \x02(\t\x12\x0e\n\x06height\x18\x03 \x01(\x05\x12\r\n\x05width\x18\x04 \x01(\x05' ) @@ -55,6 +55,243 @@ _USERPACK = _descriptor.Descriptor( ) +_BADGE_FANCLUBTEXT = _descriptor.Descriptor( + name='FanClubText', + full_name='Badge.FanClubText', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='text', full_name='Badge.FanClubText.text', index=0, + number=1, type=9, cpp_type=9, label=2, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='color', full_name='Badge.FanClubText.color', index=1, + number=2, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='level', full_name='Badge.FanClubText.level', index=2, + number=3, type=5, cpp_type=1, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto2', + extension_ranges=[], + oneofs=[ + ], + serialized_start=196, + serialized_end=253, +) + +_BADGE = _descriptor.Descriptor( + name='Badge', + full_name='Badge', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='url', full_name='Badge.url', index=0, + number=1, type=9, cpp_type=9, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='localUrl', full_name='Badge.localUrl', index=1, + number=2, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='height', full_name='Badge.height', index=2, + number=3, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='width', full_name='Badge.width', index=3, + number=4, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='type', full_name='Badge.type', index=4, + number=6, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='clickTo', full_name='Badge.clickTo', index=5, + number=7, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='fanClubText', full_name='Badge.fanClubText', index=6, + number=8, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[_BADGE_FANCLUBTEXT, ], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto2', + extension_ranges=[], + oneofs=[ + ], + serialized_start=53, + serialized_end=253, +) + + +_FANSCLUBBADGEPACK = _descriptor.Descriptor( + name='FansClubBadgePack', + full_name='FansClubBadgePack', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='badge', full_name='FansClubBadgePack.badge', index=0, + number=1, type=11, cpp_type=10, label=2, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='title', full_name='FansClubBadgePack.title', index=1, + number=2, type=9, cpp_type=9, label=1, + has_default_value=True, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto2', + extension_ranges=[], + oneofs=[ + ], + serialized_start=255, + serialized_end=314, +) + + +_FANSCLUBPACK_FANSCLUB = _descriptor.Descriptor( + name='FansClub', + full_name='FansClubPack.FansClub', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='title', full_name='FansClubPack.FansClub.title', index=0, + number=1, type=9, cpp_type=9, label=2, + has_default_value=True, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='level', full_name='FansClubPack.FansClub.level', index=1, + number=2, type=5, cpp_type=1, label=2, + has_default_value=True, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='someEnum', full_name='FansClubPack.FansClub.someEnum', index=2, + number=3, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='fansClubs', full_name='FansClubPack.FansClub.fansClubs', index=3, + number=4, type=11, cpp_type=10, label=2, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto2', + extension_ranges=[], + oneofs=[ + ], + serialized_start=375, + serialized_end=477, +) + +_FANSCLUBPACK = _descriptor.Descriptor( + name='FansClubPack', + full_name='FansClubPack', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='fansClub', full_name='FansClubPack.fansClub', index=0, + number=1, type=11, cpp_type=10, label=2, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[_FANSCLUBPACK_FANSCLUB, ], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto2', + extension_ranges=[], + oneofs=[ + ], + serialized_start=317, + serialized_end=477, +) + + _USER_AVATAR = _descriptor.Descriptor( name='Avatar', full_name='User.Avatar', @@ -88,124 +325,8 @@ _USER_AVATAR = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=324, - serialized_end=357, -) - -_USER_BADGE_FANCLUBTEXT = _descriptor.Descriptor( - name='FanClubText', - full_name='User.Badge.FanClubText', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='text', full_name='User.Badge.FanClubText.text', index=0, - number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='color', full_name='User.Badge.FanClubText.color', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='level', full_name='User.Badge.FanClubText.level', index=2, - number=3, type=5, cpp_type=1, label=2, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=508, - serialized_end=565, -) - -_USER_BADGE = _descriptor.Descriptor( - name='Badge', - full_name='User.Badge', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='url', full_name='User.Badge.url', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='localUrl', full_name='User.Badge.localUrl', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='height', full_name='User.Badge.height', index=2, - number=3, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='width', full_name='User.Badge.width', index=3, - number=4, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='type', full_name='User.Badge.type', index=4, - number=6, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='clickTo', full_name='User.Badge.clickTo', index=5, - number=7, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='fanClubText', full_name='User.Badge.fanClubText', index=6, - number=8, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[_USER_BADGE_FANCLUBTEXT, ], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=360, - serialized_end=565, + serialized_start=779, + serialized_end=812, ) _USER_FOLLOW = _descriptor.Descriptor( @@ -241,8 +362,8 @@ _USER_FOLLOW = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=567, - serialized_end=618, + serialized_start=814, + serialized_end=865, ) _USER_PAYGRADE = _descriptor.Descriptor( @@ -313,8 +434,8 @@ _USER_PAYGRADE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=621, - serialized_end=782, + serialized_start=868, + serialized_end=1024, ) _USER_HONORLEVEL = _descriptor.Descriptor( @@ -343,8 +464,8 @@ _USER_HONORLEVEL = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=784, - serialized_end=824, + serialized_start=1026, + serialized_end=1061, ) _USER_NOBLE_NOBLEBOARDER = _descriptor.Descriptor( @@ -394,8 +515,8 @@ _USER_NOBLE_NOBLEBOARDER = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=896, - serialized_end=971, + serialized_start=1133, + serialized_end=1208, ) _USER_NOBLE = _descriptor.Descriptor( @@ -431,8 +552,8 @@ _USER_NOBLE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=827, - serialized_end=971, + serialized_start=1064, + serialized_end=1208, ) _USER = _descriptor.Descriptor( @@ -506,7 +627,14 @@ _USER = _descriptor.Descriptor( is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='totalPaid', full_name='User.totalPaid', index=9, + name='fansClub', full_name='User.fansClub', index=9, + number=24, type=11, cpp_type=10, label=2, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='totalPaid', full_name='User.totalPaid', index=10, number=34, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -515,7 +643,7 @@ _USER = _descriptor.Descriptor( ], extensions=[ ], - nested_types=[_USER_AVATAR, _USER_BADGE, _USER_FOLLOW, _USER_PAYGRADE, _USER_HONORLEVEL, _USER_NOBLE, ], + nested_types=[_USER_AVATAR, _USER_FOLLOW, _USER_PAYGRADE, _USER_HONORLEVEL, _USER_NOBLE, ], enum_types=[ ], serialized_options=None, @@ -524,19 +652,22 @@ _USER = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=53, - serialized_end=971, + serialized_start=480, + serialized_end=1208, ) _USERPACK.fields_by_name['user'].message_type = _USER +_BADGE_FANCLUBTEXT.containing_type = _BADGE +_BADGE.fields_by_name['fanClubText'].message_type = _BADGE_FANCLUBTEXT +_FANSCLUBBADGEPACK.fields_by_name['badge'].message_type = _BADGE +_FANSCLUBPACK_FANSCLUB.fields_by_name['fansClubs'].message_type = _FANSCLUBBADGEPACK +_FANSCLUBPACK_FANSCLUB.containing_type = _FANSCLUBPACK +_FANSCLUBPACK.fields_by_name['fansClub'].message_type = _FANSCLUBPACK_FANSCLUB _USER_AVATAR.containing_type = _USER -_USER_BADGE_FANCLUBTEXT.containing_type = _USER_BADGE -_USER_BADGE.fields_by_name['fanClubText'].message_type = _USER_BADGE_FANCLUBTEXT -_USER_BADGE.containing_type = _USER _USER_FOLLOW.containing_type = _USER -_USER_PAYGRADE.fields_by_name['badge'].message_type = _USER_BADGE +_USER_PAYGRADE.fields_by_name['badge'].message_type = _BADGE _USER_PAYGRADE.containing_type = _USER -_USER_HONORLEVEL.fields_by_name['badge'].message_type = _USER_BADGE +_USER_HONORLEVEL.fields_by_name['badge'].message_type = _BADGE _USER_HONORLEVEL.containing_type = _USER _USER_NOBLE_NOBLEBOARDER.containing_type = _USER_NOBLE _USER_NOBLE.fields_by_name['boarder'].message_type = _USER_NOBLE_NOBLEBOARDER @@ -544,10 +675,14 @@ _USER_NOBLE.containing_type = _USER _USER.fields_by_name['avatarThumb'].message_type = _USER_AVATAR _USER.fields_by_name['avatarMedium'].message_type = _USER_AVATAR _USER.fields_by_name['avatarLarge'].message_type = _USER_AVATAR -_USER.fields_by_name['badge'].message_type = _USER_BADGE +_USER.fields_by_name['badge'].message_type = _BADGE _USER.fields_by_name['follow'].message_type = _USER_FOLLOW _USER.fields_by_name['payGrade'].message_type = _USER_PAYGRADE +_USER.fields_by_name['fansClub'].message_type = _FANSCLUBPACK DESCRIPTOR.message_types_by_name['UserPack'] = _USERPACK +DESCRIPTOR.message_types_by_name['Badge'] = _BADGE +DESCRIPTOR.message_types_by_name['FansClubBadgePack'] = _FANSCLUBBADGEPACK +DESCRIPTOR.message_types_by_name['FansClubPack'] = _FANSCLUBPACK DESCRIPTOR.message_types_by_name['User'] = _USER _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -558,6 +693,43 @@ UserPack = _reflection.GeneratedProtocolMessageType('UserPack', (_message.Messag }) _sym_db.RegisterMessage(UserPack) +Badge = _reflection.GeneratedProtocolMessageType('Badge', (_message.Message,), { + + 'FanClubText' : _reflection.GeneratedProtocolMessageType('FanClubText', (_message.Message,), { + 'DESCRIPTOR' : _BADGE_FANCLUBTEXT, + '__module__' : 'XiguaUser_pb2' + # @@protoc_insertion_point(class_scope:Badge.FanClubText) + }) + , + 'DESCRIPTOR' : _BADGE, + '__module__' : 'XiguaUser_pb2' + # @@protoc_insertion_point(class_scope:Badge) + }) +_sym_db.RegisterMessage(Badge) +_sym_db.RegisterMessage(Badge.FanClubText) + +FansClubBadgePack = _reflection.GeneratedProtocolMessageType('FansClubBadgePack', (_message.Message,), { + 'DESCRIPTOR' : _FANSCLUBBADGEPACK, + '__module__' : 'XiguaUser_pb2' + # @@protoc_insertion_point(class_scope:FansClubBadgePack) + }) +_sym_db.RegisterMessage(FansClubBadgePack) + +FansClubPack = _reflection.GeneratedProtocolMessageType('FansClubPack', (_message.Message,), { + + 'FansClub' : _reflection.GeneratedProtocolMessageType('FansClub', (_message.Message,), { + 'DESCRIPTOR' : _FANSCLUBPACK_FANSCLUB, + '__module__' : 'XiguaUser_pb2' + # @@protoc_insertion_point(class_scope:FansClubPack.FansClub) + }) + , + 'DESCRIPTOR' : _FANSCLUBPACK, + '__module__' : 'XiguaUser_pb2' + # @@protoc_insertion_point(class_scope:FansClubPack) + }) +_sym_db.RegisterMessage(FansClubPack) +_sym_db.RegisterMessage(FansClubPack.FansClub) + User = _reflection.GeneratedProtocolMessageType('User', (_message.Message,), { 'Avatar' : _reflection.GeneratedProtocolMessageType('Avatar', (_message.Message,), { @@ -567,20 +739,6 @@ User = _reflection.GeneratedProtocolMessageType('User', (_message.Message,), { }) , - 'Badge' : _reflection.GeneratedProtocolMessageType('Badge', (_message.Message,), { - - 'FanClubText' : _reflection.GeneratedProtocolMessageType('FanClubText', (_message.Message,), { - 'DESCRIPTOR' : _USER_BADGE_FANCLUBTEXT, - '__module__' : 'XiguaUser_pb2' - # @@protoc_insertion_point(class_scope:User.Badge.FanClubText) - }) - , - 'DESCRIPTOR' : _USER_BADGE, - '__module__' : 'XiguaUser_pb2' - # @@protoc_insertion_point(class_scope:User.Badge) - }) - , - 'Follow' : _reflection.GeneratedProtocolMessageType('Follow', (_message.Message,), { 'DESCRIPTOR' : _USER_FOLLOW, '__module__' : 'XiguaUser_pb2' @@ -621,8 +779,6 @@ User = _reflection.GeneratedProtocolMessageType('User', (_message.Message,), { }) _sym_db.RegisterMessage(User) _sym_db.RegisterMessage(User.Avatar) -_sym_db.RegisterMessage(User.Badge) -_sym_db.RegisterMessage(User.Badge.FanClubText) _sym_db.RegisterMessage(User.Follow) _sym_db.RegisterMessage(User.PayGrade) _sym_db.RegisterMessage(User.HonorLevel) diff --git a/api.py b/api.py index 048da67..fb5d3f6 100644 --- a/api.py +++ b/api.py @@ -363,16 +363,14 @@ class XiGuaLiveApi: _gift.backupName = _each.message.commonInfo.displayText.params.gifts.gift.name self.onPresentEnd(_gift) elif _each.method == "WebcastFansclubMessage": - continue - _userRawData = _each.message.content4 - _userPb = UserPb() - _userPb.ParseFromString(_userRawData) + _fansClubMessage = FansClubMessage() + _fansClubMessage.ParseFromString(_each.raw) _user = User() - _user.id = _userPb.id - _user.name = _userPb.nickname - self.onJoin(_user) - print(_each.message.content2) - print(_each.message.content3) + _user.id = _fansClubMessage.user.id + _user.name = _fansClubMessage.user.nickname + print(_fansClubMessage.someEnum) + print(_fansClubMessage.someInt3) + # self.onJoin(_user) else: pass # 更新抽奖信息