Merge branch 'protobuf_update'

# Conflicts:
#	messages/control.py
#	messages/utils.py
#	protobuf/message.proto
#	protobuf/message_pb2.py

messages/control.py

@@ -9,4 +9,5 @@ class ControlMessage(Base):
         self.instance = message_pb2.ChatMessage()
 
     def __str__(self):
+        # 基本上都是下播了，比如主播离开了，违规被Ban了啥的，有这个消息，直播间信息必然发生变化
         return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) + '【直播间信息】'

messages/fansclub.py

@@ -0,0 +1,17 @@
+import time
+
+from protobuf import message_pb2
+from messages.base import Base
+
+class FansclubMessage(Base):
+    def __init__(self):
+        self.instance = message_pb2.FansclubMessage()
+
+    def format_content(self):
+        return self.instance.content
+
+    def __str__(self):
+        if self.instance.type == 1:
+            return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) + '【加入粉丝团】' +  self.format_content()
+        elif self.instance.type == 2:
+            return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) + '【粉丝牌升级】' +  self.format_content()

protobuf/message.proto

@@ -168,6 +168,14 @@ message ControlMessage {
     int32 status = 2;
 }
 
+message FansclubMessage {
+	Common commonInfo = 1;
+	// 升级是1，加入是2
+	int32 type = 2;
+	string content = 3;
+	User user = 4;
+}
+
 message Common{
     string method = 1;
     int64 msgId = 2;