xml output

messages/base.py

@@ -13,6 +13,12 @@ class Base:
     def extra_info(self):
         return dict()
 
+    @property
+    def room_id(self):
+        if hasattr(self.instance, 'common'):
+            return self.instance.common.roomId
+        return None
+
     def user(self):
         if(hasattr(self.instance, 'user')):
             return self.instance.user

messages/chat.py

@@ -7,6 +7,10 @@ class ChatMessage(Base):
     def __init__(self):
         self.instance = message_pb2.ChatMessage()
 
+    @property
+    def content(self):
+        return self.instance.content
+
     def format_content(self):
         return self.user().nickname + ': ' + self.instance.content
 

messages/gift.py

@@ -11,9 +11,14 @@ class GiftMessage(Base):
         return {
             'giftId': self.instance.gift.id,
             'giftName': self.instance.gift.name,
-            'giftCount': self.instance.gift.diamondCount,
+            'giftCount': self.instance.repeatCount,
+            'diamondCount': self.instance.gift.diamondCount,
         }
 
+    @property
+    def gift(self):
+        return self.instance.gift
+
     def format_content(self):
         return self.instance.common.describe