From 481c2f8b6b3db3ccf3da7af1b7d2c69fb0aea6ce 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 17:21:27 +0800
Subject: [PATCH] 1

---
 config/settings.yml                           |   3 ++
 messages/__pycache__/base.cpython-39.pyc      | Bin 1843 -> 1815 bytes
 .../__pycache__/roomuserseq.cpython-39.pyc    | Bin 950 -> 1105 bytes
 messages/__pycache__/utils.cpython-39.pyc     | Bin 2051 -> 2085 bytes
 messages/base.py                              |  38 +++++++++---------
 messages/roomuserseq.py                       |   5 +++
 messages/utils.py                             |   4 +-
 scripts/__pycache__/utils.cpython-39.pyc      | Bin 0 -> 412 bytes
 scripts/__pycache__/watcher.cpython-39.pyc    | Bin 1532 -> 1509 bytes
 scripts/utils.py                              |  10 +++++
 scripts/watcher.py                            |   1 -
 store/__pycache__/mongo.cpython-39.pyc        | Bin 1214 -> 1390 bytes
 store/mongo.py                                |   3 ++
 13 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 scripts/__pycache__/utils.cpython-39.pyc
 create mode 100644 scripts/utils.py

diff --git a/config/settings.yml b/config/settings.yml
index fe8e75a..abc9090 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -9,3 +9,6 @@ mongo:
   uri : 'mongodb://localhost:27017/'
   dbname: 'tiktok'
   enabled: 'on' 
+
+api:
+  userinfo: 'https://live.douyin.com/webcast/user/?aid=6383&target_uid='
\ No newline at end of file
diff --git a/messages/__pycache__/base.cpython-39.pyc b/messages/__pycache__/base.cpython-39.pyc
index cdbf6f6cf28be63468d8963ef5951c451868c52e..18da0885708b0add7905d32dd7d8bd289c6f2f6c 100644
GIT binary patch
delta 944
zcmX|9J8u&~5Z>9_+dDtwI1eWgpwL8dKvYyH0ttdpDAKq<IST8zT@pLKJ8N$vg~-N*
zDQFO&L!t?iU8P1yAn^mJsVMFrz;B2IvyRQK=G)nMd^0z<U&<fLCBIb46I`#i&;4)j
zOIIJ?#fu;UI>a+4?LY_~fYGfE4K2@_=&Zv++p~c@BElB@6%l+$JuaX@>dtS&xcB*J
z6QGcOfEdatqc;Z@S|6Y!D+rqONE-wUsaiBzn>MfpX4Acl9Vb%Nt;{*}6JKkk986I2
z2IdSD{zGx*FwTS{5GaC6PjmPEMBXwy0T?T;^evr-jdV=c20t_mNgsM-M8~90dsL8P
zP@)GTORzD1Eow~IJ=(TgFowi<xVfP?C@xA)@UvO0g<p_w7uv;1?xkLu+R9jEZcKD#
zG(RTos&IrmcmpDL#`@N@@YkL-S`c|tz?1``aU`RqF&TpTX?&NrX=A)+8SM#)b{Nsi
z@8HEckUj%)x}|HgMns{8*~nDWE2CAzWHR<~#C`TMJ-4b*Out*#26d(ua5kBf9L7rT
zip-5#!BOOgGUEp_5>hEMzdB@vuob8{kwF}ZI?L=ZIlyqP;yA?9L9>>T_VR&}zLuit
z>x`TE?~2p8^{!M&E78e1^2MsYrWleci#(nFSFfB%-3;PRM+UkTM;VtVCVtYKmv2Q#
zq?>Uh)uKsUGO%pGyo`(oaTuDUQ0l{2DD%G5YPxLK@9^WUz;-gLBO_HY!MTSgf$UC-
z*j?3%be7Y~59BjHILh+RV-@<kDNlklvTyIyFeBMUAW#KHDRAn73wc@rHrp4jQ<+#f
zlrOmBqMiTctO#XVh6+^EKlVP{OLusKZy}Mok$&P=uA9aa^L$;(sB7Wo?xwQQP<PY@
R9_cUMD7q#9Uv!Zc=|7fK-g^K5

delta 898
zcmXw1&1=*^6rVRqX1Cc*y4`+mzbJxewBSX=i=Y(If)rs3YA#E<Gp!r4$ugPsqwZ3$
zf~SI#gO>`sAb1up9z9AAo;>A0@Zimpg8F8+W_Z7OZ{ExA{qizz+>fpkIF3#5dG5Xs
zUcPo#Zd}2D6Alq+6Q6+gX#{QR(~)mPM%(mFAh!rNx%Gl@>yY{uXLaHgzH6or>O6p*
zy@dpv%%SV&01r3N(jr2Sgd~JIkqiTm$^ve=*-eGadbC!m=sJo(AbUs8!c2BT7Y{xw
zI3#`O!GLme2!JdDV@Ue62O)~+(a>svMl^<2Kr5n6gf?e2f?g>skI><TW6F!ij8Aa;
z$Ur9KL``lu8CJ&3BY*1jtcq`04Qw|(Bx+_bJ0#&8XS{R-ynJl+4K<Isg&{cvdD1fm
zwQ)2eg27_X(B3@~Up0wZdIe8iAbp(O{;FF3-;_J^**9Zt)7|o|b`tL;enG^+P9(Tb
zlUPpa`Op@ZdWs&+-Q6ULlE<xhZzJi(DtE@QkfYFJvYO4Cs|S8Lcoe8WHq^szdndQY
zRh#i{vh9J-x*Z(2@*pp@TTPjyqM5|pvvRAQ?rrj%$s}p(UH=!{3z$|SR=(YoB2a=i
z0<}N6))6vor7B$$QYO+{ktS-C2Eu*cO@(SSQLAXG*6DZnB`G>l&=id%7P6{~XEn@e
zm`BJ<W7XRu(S@#z?jXNh(D`W%Guc<O#ul}^l>IQhOGYGOsV@y`?QoRl+pSoCn{JU$
z+<ej$9o;{-I<gh3?5=hBwq{DNBM_*9NhvU}X_1=1{!+t)@v<oc_Q(8X+Vm%LD@GBD
zm|@`lX2mkN)P+j+#d-kOvNNpCE+Uy+&z`a66@9PMG6FKvqA^+*q=g4t9?L$lx~(h9
IP^M-253N(&%K!iX

diff --git a/messages/__pycache__/roomuserseq.cpython-39.pyc b/messages/__pycache__/roomuserseq.cpython-39.pyc
index 83704f1252a100cdb4824046c15320e0a66f7d97..b665d8c9263d16f8a3744280d8371e5f810758ff 100644
GIT binary patch
delta 212
zcmdnSevyMWk(ZZ?0SIF3mM4Ci$lJ%LGjWb8PYOp1Llj#IXE1{%*TkbwbeMoDoPoHQ
z2S}ta)-Yr-WHDwk0;QS!Zn2i+mn7zBG8M4_C5w0_Z(x!z=Sr<8DN2mb%uCA$8DGo-
zBp8@D{#VHc<>%*y7N-^krxyCA78fU`r|KcpPM*P-!pJ}QFXJX4xq(T6QE2i-CJjdR
p$-kKN+4w=m3s2T!Ruts`GC3GIm^oNEn2SJWYqAvyOparY004XdG+Y1x

delta 100
zcmcb}v5lQKk(ZZ?0SI0#UXnOzB5xm~%EURUEWr$#923tznQY4x%*Zu)BGV>D-pO|v
zB__u(a{yVX%o>brllz$U83iXRvWQQ<#mptl1~h|%k%O6oxrhbG)MP8-oBWeG0sv}n
B7<~W$

diff --git a/messages/__pycache__/utils.cpython-39.pyc b/messages/__pycache__/utils.cpython-39.pyc
index f5451f7d636c096e3173d1c03f59b57731bff414..821dbb3acee7b4a9f0ecb0010c119ffccb2690b7 100644
GIT binary patch
delta 283
zcmZn`SSrAq$ji&c00dKPmnV8}<P~5Ry1~f6P{ZKDFo7}lOfBOC#;R$P^_d;H18Nwv
z7*bfXnTjS&u4Xpjo4}aI2Nq%j3SFAKo7t529GK6Z%`}0rNM!O~phyo`gaa%RHrbxV
zl-CO^!U+~xFu9RMM68BAOR$-dk)eit0n0)LMurmB6s8iP$un7`S%oJsR$iFAlV!h*
z$St<q)RK(+lp<!JW23l>Q%m9t5-W4^6H}rlPhpMb<jBk`E=kNwPM!RYbq=H3<Zd=;
zM!Ct$*;H5=xfnT^CZA#3t|klAS|kr56hMR`h)@C%DnKHNHQd89#I;Cn@=Eq70JA4c
AX8-^I

delta 249
zcmZ1~&@8~4$ji&c00ci2mM4mB<P~5RI>N}nP{ZKDFo7|4M=j$7#;T^t`pk~pHZ_b{
z3@NPHOhpqWS2LUN<oy8)umJ@wOy0|E%DV^5XU}Guz*r<S`9Dyk3M|3_773Z`$YQE$
z0T$r|i}aKTG&9t)*RU^O0*W#(WMpJ0VNGEw5uCi1MVeJ;0%PT#$!A&iGYU`cWtC#Q
zHF*VV^kiPP*^Ew;SF%Yn%P?_GzQ`sy`2iazBlF~UY}?i3fW9bF01=8HLJ34Dg9sHM
S5ycwr;ThsuBtQ8ydlUfqFF~vT

diff --git a/messages/base.py b/messages/base.py
index 0fee36f..4942dc2 100644
--- a/messages/base.py
+++ b/messages/base.py
@@ -1,3 +1,4 @@
+import traceback
 from datetime import datetime
 from store.mongo import MongoStore
 
@@ -14,7 +15,10 @@ class Base:
         return dict()
         
     def user(self):
-        return self.instance.user
+        if(hasattr(self.instance, 'user')):
+            return self.instance.user
+        
+        return None
 
     def persists(self):
         if config()['mongo']['enabled'] != 'on':
@@ -22,41 +26,39 @@ class Base:
 
         try:
             store = MongoStore()
-            store.set_collection('user')
 
             user = self.user()
+            if user is not None:
+                store.set_collection('user')
 
-            store.replace_one({
-                "id": user.id
-            }, {
-                "id": user.id,
-                "shortId": user.shortId,
-                "nickname": user.nickname,
-                "gender": user.gender,
-                "avatar_thumb": user.avatarThumb.urlList[0],
-                "followInfo": {
-                    "followingCount": user.followInfo.followingCount,
-                    "followerCount": user.followInfo.followerCount
-                }
-            }, upsert=True)
+                if not store.exists({'id': user.id}):
+                    store.insert_one({
+                        'id': user.id,
+                        'shortId': user.shortId,
+                        'nickname': user.nickname,
+                        'gender': user.gender
+                    })
 
             store.set_collection(self.instance.common.method)
-
             msg = {
                 "msgId": self.instance.common.msgId,
                 "roomId": self.instance.common.roomId,
-                "userId": user.id,
                 'content': self.format_content(),
                 'created_at': datetime.today().replace(microsecond=0)
             }
 
+            if user is not None:
+                msg.update({
+                    'userId': user.id
+                })
+
             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')
-
+            print(traceback.format_exc())
 
     def __str__(self):
         pass
diff --git a/messages/roomuserseq.py b/messages/roomuserseq.py
index 2dc5c41..25115c9 100644
--- a/messages/roomuserseq.py
+++ b/messages/roomuserseq.py
@@ -7,6 +7,11 @@ class RoomUserSeqMessage(Base):
     def __init__(self):
         self.instance = message_pb2.RoomUserSeqMessage()
 
+    def extra_info(self):
+        return {
+            'total': self.instance.total,
+        }
+
     def format_content(self):
         return self.instance.totalUserStr
 
diff --git a/messages/utils.py b/messages/utils.py
index 7eed281..8a2a888 100644
--- a/messages/utils.py
+++ b/messages/utils.py
@@ -74,9 +74,9 @@ def decodeMsg(messages):
             elif message.method == 'WebcastRoomUserSeqMessage':
                 room_user_seq_message = RoomUserSeqMessage() 
                 room_user_seq_message.set_payload(message.payload)
-                # room_user_seq_message.persists()
+                room_user_seq_message.persists()
 
                 print(f"\n{YELLOW}[+] {room_user_seq_message} {RESET}")
 
         except Exception as e:
-            print(e)
\ No newline at end of file
+            print(e)
diff --git a/scripts/__pycache__/utils.cpython-39.pyc b/scripts/__pycache__/utils.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..32fb11f98e10ebb77e74592cc8d76c25f86f558f
GIT binary patch
literal 412
zcmYjNy-ve05Wch1Dr%b<RbpU5%F<LUFd&2kbC;?@WI<8w2GcYNwu1yJQ+befLOcg=
z;gyM3VB#DYde(iX`~7^EMNtn(PEX#mPqJU$*%wC6C8;?g5FoIC)LT~Iilq!ea1p#g
z$^}j#?tD`fOk#B1c~ve{K1Uz;7eA{@dPQo^2wsjYY|*j}%^lLrAy~eK4IaP_UvZ7w
zU<Wra1#I6flx$4g#KR|!XSH%+W29E)qKZ2%)bg>B#u~?SX|*SF+*q9k52h+(=6Iuo
zL;V5TulzGkX4GtwT$XuqEzQzabz&8n<z1nkWMbx8)z&19RfQSV&#q5%eUB&X_#N8Q
yA;UxLVHfp)VsW5-%0++skM3nrOWppa&9~fp(D%jR`Kl64Aus&3Oh6E_0s93TidvNb

literal 0
HcmV?d00001

diff --git a/scripts/__pycache__/watcher.cpython-39.pyc b/scripts/__pycache__/watcher.cpython-39.pyc
index 7b44dd70b87fc5ead923693b6b51683c984cc8ae..2e029f873e8c41dfa63cc88b538ebb699b5e4c88 100644
GIT binary patch
delta 144
zcmeyv{gj(8k(ZZ?0SG1;El+&Uypd0q#Y_drtzpPwDB?<C2nMkjQy8<EiWEwi7BB;O
zEDISK89*|cOny=9$wjG&C8;TztdsLuq{NGafO?~t3rb6(IEsss;|mf?GBg>ZCNF2v
j;N}2X!^FnO!o)TC4vPh&)MQasf1q3{s~3>m!0H14jQk<A

delta 167
zcmaFL{fC<`k(ZZ?0SIywmnU+vY~+(=anS*CYZ$T^invl3f<Y|C6vk|(B8?KJ6sBfI
zMurmR1uQ^O)`dVeNQEY|Ule<CQEFmIYRWB^jMSo3O}5F2EK+i}SPP0W^Gb?@fCk=T
zE+{RD;wUakjxR_o$<SoHHF*+?2E=YAHbxdEE=G>YM_DWw<tG1Q@dwKKv3dc?nXEnl
D@tG<@

diff --git a/scripts/utils.py b/scripts/utils.py
new file mode 100644
index 0000000..5b99707
--- /dev/null
+++ b/scripts/utils.py
@@ -0,0 +1,10 @@
+import requests
+
+from config.helper import config
+
+def getUserinfo(uid):
+    try:
+        r = requests.get(config()['api']['userinfo'] + str(uid))
+        return r.json()
+    except:
+        pass
\ No newline at end of file
diff --git a/scripts/watcher.py b/scripts/watcher.py
index 10b3f8b..5623741 100644
--- a/scripts/watcher.py
+++ b/scripts/watcher.py
@@ -39,6 +39,5 @@ class Handler(FileSystemEventHandler):
             return None
 
         elif event.event_type == 'created':
-            print('here')
             q.put(event.src_path)
 
diff --git a/store/__pycache__/mongo.cpython-39.pyc b/store/__pycache__/mongo.cpython-39.pyc
index ba81d92c79162c5fe42e5d2144bb709a93f90642..84ea61386818d04382e4c00d5e8259db5945e584 100644
GIT binary patch
delta 598
zcmZuuJxc>Y5WU^I$mNnt{Qg2q#j_9#u@V~_8%5A67IL{=<&w*->|Q`c5W!aA*xpwB
z58}VDaKRs7Blr)TITKBhg?a4k?0Yl&_O<-w`JwN77OZ^zDSXR)MYi+X1yau+=c~-W
zvl=d|9a_O?{_-$uMxrF<X=W&E2E;guC#TPr^mLQx6&Ey&7l|a{Q5K6dpt1}{vW9>i
zexafl>D3M%nu_G-Nf_}Hk@CPPZkuu>QWhiMI4sOUIr_&eG%A>m0r>jEp3&cQbHj%W
zniY~>oGLCeRDACBpBN%AsgLc0wLxN~N9=^@rJNc<nbz<2@=Zjc)L*!FAa)?sB*3-R
zvRdStFv93PWp>*J=bZgd0yXffl*FAllSTGBZ=)WGZknAi5p_FYtm>OK4vaz5AT=ZW
zVkK6YnubIbbC9dCJ&~S?!%RrN#xJnCACRM<tV_<)ZWTr92xyqZ2_=%{9K!#X{2OaS
lp#-6j>Jry+ZO?Xf+X+^OTsQ7kN3d?fxA92|t#E0T{s35Zc?SRh

delta 413
zcmaFIwU3iGk(ZZ?0SKPCFH6jv$Xm>4HnCBLk$2)eDVAUcO}>do`Xr**l5;Xs^Ga?p
zr6g%G-eM_E%}HCyP{cVoi*d3BJ5cW}uH^ijoYdr!%=|n}rXmiYP!TVP;Di%glU13j
z>_LLJxQkK?auSnM<MZ=UHCe!_qd1fE^HMTF`fstMB$gx=@xyh3%>X&ENMQ0kra%)O
zAQNZ_*eI^dyyDcN5|BwNq4o-5(I_-InK?iYStB=8V{T$zWsxuzEh3X2GOMxqX)=ar
za!g*wqUy*EQp5)$1VDrkh!6o02tOiR$_$iX1>$0myEzy+SU8xuCQGwwYGF})i^C>2
TKczG$)s7LQg9W66iH8XQNe)w^

diff --git a/store/mongo.py b/store/mongo.py
index 097f153..df85009 100644
--- a/store/mongo.py
+++ b/store/mongo.py
@@ -18,3 +18,6 @@ class MongoStore:
 
     def insert_many(self, data):
         return self.collection.insert_many(data)
+
+    def exists(self, condition):
+        return self.collection.count_documents(condition, limit = 1) != 0