From 458ecea79dc58ce922184a48ef08d6d9b2a60647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=BF=E4=BC=A6=E4=BC=A6?= <gll19920817@gmail.com>
Date: Wed, 1 Dec 2021 13:48:46 +0800
Subject: [PATCH] giftId

---
 messages/__pycache__/base.cpython-39.pyc  | Bin 1579 -> 1844 bytes
 messages/__pycache__/gift.cpython-39.pyc  | Bin 915 -> 1134 bytes
 messages/__pycache__/utils.cpython-39.pyc | Bin 1994 -> 1994 bytes
 messages/base.py                          |  16 +++++++++++++---
 messages/gift.py                          |   7 +++++++
 messages/utils.py                         |   6 ++++++
 6 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/messages/__pycache__/base.cpython-39.pyc b/messages/__pycache__/base.cpython-39.pyc
index c522b12f467b13b5ebbe58e20f2216ea1af3d8a6..11e049f744d6a7d1ec3ae9dd84af6bf8437de1e9 100644
GIT binary patch
delta 1113
zcmZuwId2q85bm05$GfxR10R@67HEam2xCA(2t5#o5HA1{gAkL9hV8aJ%N(noUXIlo
z2PS+0W)cE|-3TEvL`(|5p<|Mlk-y|sjSWbM8BI-9SNGS|Uw!?-`{eskvsq{OobcX7
z|2Vt;kvkVK;*3MWQWh{E-$)=e0;BTH#7wQg0(OgWi`y?5w|9)d=FS>x*Zw7_HfWbe
zN~ky$yWu&wxchpwS?7(HEO0sCG;jAy42|+ET!(t8;KF?eS1Go`)|ez00W2PO)O(N<
z7|O;^<DsYP;+c|B7-#Ew6XU`_!(cFZJu1Y?uUz>GPM)gZ3|XUfR=*HZPNMr8qMXLD
zsqz~fZ`<e*A2;wTW?-)@4vWYEe&%CS&T}kt@VPu=bhn4B>vt!+)BFFKq0zO6Y;<7E
z)a+<(%trIPF$V6vwYN;QfSH41wgd9(&>Su9MPmRqgwdg)N!|mNU9^}w{0g3Xz_yU&
z!7+7YAAO297jQMrdWcQgvR*7(S-o<sRkn&lNUeW2u+u!-$b*{5qDP6~fsto&x;$>K
z!c4hl-k2Lqw;rBurKekbsrC1z)}2eOwYFWpF_*T3dPfRu91kNkm|W@!S;U1ZmXNhv
zwvS2+Ns%U+z%PUfJ9(0bj*1DN1{+fJlBgrXJQH$;=FX9sC$oS?H=-wzisZe`e)>q)
z`ZBqV@bVz#51`qWv*cF2ayog6=g>|n)Mn1*B4rMt(f)ca(};G@l*p8%?rSs4pK2Gu
z)=6~QOhhK9DB<*bB*mZ}XV`p2rRj;A&pM(<b!)pP<4m>fN@wQ-yHL3l)oHYu78@GG
zZ&K0j4_2t+;%fQPTA4LnaKQoxy#E~61K;prs{C%9zeeiY1NejLbS(_A;xN2SNc$r8
zDiQA|+7l(WTiZm4B&AnJs;ZOA6rLjU>vB{c-4IDCro9V_T*ES4vwD}S%-yzAu@*F{
w<E~VCsrss$$m)8$v9c)=Jm+4+&l1|7w$biiY0mqJxPteD6||uTp5Yn)1N4~u{r~^~

delta 875
zcmZ8f&1=*^6rY()vgvM;?RODGO2tA7E{oEFPy|~<4^of{)m%clnYO#;W1Y<Uv25K#
z{Rh@~^w3@emEJu1KX}hSAfhMF9(*s`Rxm?;^XAQ)_kQo=i}TrX0^6<<_*U<K2u}5p
zb9r?IP9X_tL}KbuiZY8>ta%zG_eiLP{0#~D5%YMcZxh$}fzL-TZqVlFQ&Xp)s*b+5
zX*GXHH|RwEj;`gmn0;LbE0;+Fwu1LEAwN=S!a-vAG1O490j&HPTXH!_c)1CG_8UNv
zBj9xj_`t6{)#Q9gwn_gu|H?W;H8mg|r&B)y$^&{lJwA12&i2^>>*xb=Ja<CE+IxNi
zRy!nF<3!EB`bEhhB-g)k?xQmqS_=d{?T{x>fJ5!ImQ=@klQcmCS=w8k9;eBE>QzJ%
zRCgm0dMr((oqyAswEmWFGMDF%`Qor&U+fB*wKJ713Mo_RE=UdXkqp3dGNJrd8bzX|
z+V~!oH7UAL&=P){2w6wlX@nVsS%9JzJP%YLA071K-J;Ty(F1TV=kR_KVG5xvwlQp_
zF%T_`Sg3<EEcC8yC(5g~6X=2}Bg~`q0zl#Hr7{kXP@+Vliix`~TcV4^TweCe(=(My
zQPM1^_^*A1d7def&ej1)eyXobGK+C)!s68UV;N5VQ@?o!XJYKYxsb|nz)2`7z7Hw+
z{wf?YEES=BYa_@+<LtsUbKkf&#4M$SfTfd52v-sQP1c1|i9>~9GgO(3GgE`LT<W)6
y-K&+^HOj`8{V8lH#a?^AaUdedZQMBYa_$~Njm46*xgMusFA}#Y20=RuQvVBEkH2aF

diff --git a/messages/__pycache__/gift.cpython-39.pyc b/messages/__pycache__/gift.cpython-39.pyc
index 47ab0388cf8e093b9ba5ea686e053176c5ece8ef..58a227189dfbe19e0a12282ec1e84c19216374aa 100644
GIT binary patch
delta 302
zcmbQt{*Hq$k(ZZ?0SKhImM8i%P2}rk)R{O(l_!Oxg&~S9g)^8zlWXG9^Ytu1CC)%x
zEC(cN7_u0$7_*q5G&7WDNnxDB4Aj8nr^$SaEj=@>#4{y|BR#Vu%`Y)GHHs4?;+$Wa
zSE9*U#0E6x77Iw^7E@-*EtWi>id#G>nTfgic`0B;MeIN&MVt`A2FL_C^A=ZXMM+U&
zd}dx+K8Rn;0VEihI2eKOZ<Uxk&^+JN;^M^gR6T^k$<2&ejDnNjF)n2knLLF_0Z49T
uQe<SGe4R;)TM($fNCZSkOlD_R6a^UwG>n;porAdu<ZDf~BGJj#%n<-biAo&+

delta 98
zcmaFIF`1n&k(ZZ?0SNvtUXs|zIFYZHQDx#BRhD1|O^%6Y&ri-^ie%)Pe28f&Bj4l<
yW(7vx$(_uKjBJxvGi$N&0kstgO@6?vD9i?Aaxii*b1)aN0GXO>Mf{V+SRw!o9TtHA

diff --git a/messages/__pycache__/utils.cpython-39.pyc b/messages/__pycache__/utils.cpython-39.pyc
index 5723ab70643d4722150bc49c9a0dd5271e5680b9..6b9e066b7a45f7101fd01dff8ddc52ee1782bca2 100644
GIT binary patch
delta 77
zcmX@be~O<sk(ZZ?0SM-DEKhvAkvE#nkV%e-i;<0yhmnIx28qQ37eiw)Z=T6!$Or($
C*a;2*

delta 77
zcmX@be~O<sk(ZZ?0SMApE=fGQkvE#nkWr3_i;<0yhmnI(28qQ37eiw)ZJr6#1OV7&
B30eRE

diff --git a/messages/base.py b/messages/base.py
index 6a7e619..5bfb455 100644
--- a/messages/base.py
+++ b/messages/base.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from store.mongo import MongoStore
 
 from config.helper import config
@@ -8,6 +9,9 @@ class Base:
 
     def set_payload(self, payload):
         self.instance.ParseFromString(payload)
+
+    def extra_info(self):
+        return dict()
         
     def user(self):
         return self.instance.user
@@ -38,12 +42,18 @@ class Base:
 
             store.set_collection(self.instance.common.method)
 
-            store.insert_one({
+            msg = {
                 "msgId": self.instance.common.msgId,
                 "roomId": self.instance.common.roomId,
                 "userId": user.id,
-                'content': self.format_content()
-            })
+                'content': self.format_content(),
+                'created_at': datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            }
+
+            if len(self.extra_info()):
+                msg.update(self.extra_info())
+
+            store.insert_one(msg)
         except Exception as e:
             print(self.instance.common.method + ' persists error')
 
diff --git a/messages/gift.py b/messages/gift.py
index f73d27a..d185b0c 100644
--- a/messages/gift.py
+++ b/messages/gift.py
@@ -7,6 +7,13 @@ class GiftMessage(Base):
     def __init__(self):
         self.instance = message_pb2.GiftMessage()
 
+    def extra_info(self):
+        return {
+            'giftId': self.instance.gift.id,
+            'gitfName': self.instance.gift.name,
+            'giftCount': self.instance.gift.diamondCount,
+        }
+
     def format_content(self):
         return self.instance.common.describe
 
diff --git a/messages/utils.py b/messages/utils.py
index b145fe8..561e3b9 100644
--- a/messages/utils.py
+++ b/messages/utils.py
@@ -37,36 +37,42 @@ def decodeMsg(messages):
                 member_message = MemberMessage()
                 member_message.set_payload(message.payload)
                 member_message.persists()
+                
                 print(f"\n{RED}[+] {member_message} {RESET}")
 
             elif message.method == 'WebcastSocialMessage':
                 social_message = SocialMessage()
                 social_message.set_payload(message.payload)
                 social_message.persists()
+
                 print(f"\n{GREEN}[+] {social_message} {RESET}")
 
             elif message.method == 'WebcastChatMessage':
                 chat_message = ChatMessage()
                 chat_message.set_payload(message.payload)
                 chat_message.persists()
+
                 print(f"\n{BLUE}[+] {chat_message} {RESET}")
 
             elif message.method == 'WebcastLikeMessage':
                 like_message = LikeMessage()
                 like_message.set_payload(message.payload)
                 like_message.persists()
+
                 print(f"\n{CYAN}[+] {like_message} {RESET}")
 
             elif message.method == 'WebcastGiftMessage':
                 gift_message = GiftMessage()
                 gift_message.set_payload(message.payload)
                 gift_message.persists()
+
                 print(f"\n{MAGENTA}[+] {gift_message} {RESET}")
 
             elif message.method == 'WebcastRoomUserSeqMessage':
                 room_user_seq_message = RoomUserSeqMessage() 
                 room_user_seq_message.set_payload(message.payload)
                 # room_user_seq_message.persists()
+
                 print(f"\n{YELLOW}[+] {room_user_seq_message} {RESET}")
 
         except Exception as e: