proto更新，粉丝团，牌子

Struct/Chat.py

@@ -1,19 +1,29 @@
 from .User import User
 from .Lottery import Lottery
-
+from XiguaMessage_pb2 import ChatMessage
 
 class Chat:
-
-    content =""
-    user=None
-    filterString = ["",]
+    content = ""
+    user = None
+    filterString = ["", ]
     isFiltered = False
 
-    def __init__(self, json=None, lottery:Lottery = None):
-        if json:
-            self.parse(json)
+    def __init__(self, json=None, lottery: Lottery = None):
         if lottery:
             self.filterString.append(lottery.content)
+        if json:
+            if type(json) == bytes:
+                self.parsePb(json)
+            else:
+                self.parse(json)
+
+    def parsePb(self, raw):
+        _message = ChatMessage()
+        _message.ParseFromString(raw)
+        self.user = User(_message.user)
+        self.content = _message.content
+        if self.content in self.filterString:
+            self.isFiltered = True
 
     def parse(self, json):
         self.user = User(json)
@@ -24,8 +34,7 @@ class Chat:
             self.isFiltered = True
 
     def __str__(self):
-        return "{} : {}".format(self.user,self.content)
+        return "{} : {}".format(self.user, self.content)
 
     def __unicode__(self):
         return self.__str__()
-

Struct/Gift.py

@@ -1,5 +1,6 @@
 import requests
 from .User import User
+from XiguaMessage_pb2 import GiftMessage
 
 
 class Gift:
@@ -11,9 +12,22 @@ class Gift:
         self.count = 0
         self.amount = 0
         self.user = None
+        self.isFinished = False
         self.backupName = None
         if json:
-            self.parse(json)
+            if type(json) == bytes:
+                self.parsePb(json)
+            else:
+                self.parse(json)
+
+    def parsePb(self, raw):
+        _message = GiftMessage()
+        _message.ParseFromString(raw)
+        self.user = User(_message.user)
+        self.ID = _message.giftId
+        self.count = _message.combo
+        self.isFinished = _message.isFinished
+        self.backupName = _message.commonInfo.displayText.params.gifts.gift.name
 
     def parse(self, json):
         self.user = User(json)

Struct/User.py

@@ -1,15 +1,33 @@
-class User:
-    ID = 0
-    name = ""
-    brand = ""
-    level = 0
-    type = 0
-    block = False
-    mute = False
+from XiguaUser_pb2 import User as UserPb
 
+
+class User:
     def __init__(self, json=None):
+        self.ID = 0
+        self.name = ""
+        self.brand = ""
+        self.level = 0
+        self.type = 0
+        self.block = False
+        self.mute = False
         if json:
-            self.parse(json)
+            if type(json) == bytes:
+                self.parsePb(json)
+            elif type(json) == UserPb:
+                self.parseUserPb(json)
+            else:
+                self.parse(json)
+
+    def parseUserPb(self, _user):
+        self.ID = _user.id
+        self.name = _user.nickname
+        self.brand = _user.fansClub.fansClub.title
+        self.level = _user.fansClub.fansClub.level
+
+    def parsePb(self, raw):
+        _user = UserPb()
+        _user.ParseFromString(raw)
+        self.parseUserPb(_user)
 
     def parse(self, json):
         if "extra" in json: