q792602257/XiguaLiveDanmakuHelper
Archived
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

西瓜又升级了

Browse Source
This commit is contained in:
Jerry Yan
2020-04-23 20:55:25 +08:00
parent 47baa8b2e4
commit 28a62ae6c3
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Struct/User.py
View File

@@ -23,13 +23,17 @@ class User:
self.type = json["extra"]["user_room_auth_status"]["user_type"] self.type = json["extra"]["user_room_auth_status"]["user_type"]
self.block = json["extra"]["user_room_auth_status"]["is_block"] self.block = json["extra"]["user_room_auth_status"]["is_block"]
self.mute = json["extra"]["user_room_auth_status"]["is_silence"] self.mute = json["extra"]["user_room_auth_status"]["is_silence"]
elif "user_info" in json and json["user_info"] is not None: if "user_info" in json and json["user_info"] is not None:
self.ID = json['user_info']['user_id'] self.ID = json['user_info']['user_id']
self.name = json['user_info']['name'] self.name = json['user_info']['name']
elif "anchor" in json and json["anchor"] is not None: if "anchor" in json and json["anchor"] is not None:
if "user_info" in json["anchor"] and json["anchor"]['user_info'] is not None: if "user_info" in json["anchor"] and json["anchor"]['user_info'] is not None:
self.ID = json["anchor"]['user_info']['user_id'] self.ID = json["anchor"]['user_info']['user_id']
self.name = json["anchor"]['user_info']['name'] self.name = json["anchor"]['user_info']['name']
if "user_id" in json:
self.ID = json["user_id"]
if "user_name" in json:
self.name = json["user_name"]
if self.type is None: if self.type is None:
self.type = 0 self.type = 0
if isinstance(self.level, str): if isinstance(self.level, str):

15
api.py
View File

@@ -162,16 +162,19 @@ class XiGuaLiveApi:
for i in d["data"]: for i in d["data"]:
if self.broadcaster is not None: if self.broadcaster is not None:
break break
if i["block_type"] != 0: if i["block_type"] != 2:
continue continue
if "cells" not in i or len(i["cells"]) == 0: if "cells" not in i or len(i["cells"]) == 0:
break break
for _j in i["cells"]: for _j in i["cells"]:
_user = User(_j) if "room" in _j:
if self._checkUsernameIsMatched(_user): _user = User(_j["room"])
self.isValidUser = True self.roomID = _j["room"]["room_id"]
self.broadcaster = _user self.isLive = _j["room"]["is_living"]
break if self._checkUsernameIsMatched(_user):
self.isValidUser = True
self.broadcaster = _user
break
self._updRoomAt = datetime.now() self._updRoomAt = datetime.now()
return self._updateUserInfo() return self._updateUserInfo()