github-repos/blivechat
1
0
Fork 0
mirror of https://github.com/xfgryujk/blivechat.git synced 2025-03-13 19:30:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from simon300000/https-face

Browse Source 
auto http/https avatarUrl
This commit is contained in:
John Smith 2019-11-30 14:26:20 +08:00 committed by GitHub
commit 20ec58b965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
views/chat.py
View File

@ -26,7 +26,7 @@ class Command(enum.IntEnum):
DEL_SUPER_CHAT = 6 DEL_SUPER_CHAT = 6
DEFAULT_AVATAR_URL = 'https://static.hdslb.com/images/member/noface.gif' DEFAULT_AVATAR_URL = '//static.hdslb.com/images/member/noface.gif'
_http_session = aiohttp.ClientSession() _http_session = aiohttp.ClientSession()
_avatar_url_cache: Dict[int, str] = {} _avatar_url_cache: Dict[int, str] = {}
@ -68,7 +68,7 @@ async def get_avatar_url(user_id):
data = await r.json() data = await r.json()
except aiohttp.ClientConnectionError: except aiohttp.ClientConnectionError:
return DEFAULT_AVATAR_URL return DEFAULT_AVATAR_URL
url = data['data']['face'] url = data['data']['face'].replace('http:', '').replace('https:', '')
if not url.endswith('noface.gif'): if not url.endswith('noface.gif'):
url += '@48w_48h' url += '@48w_48h'
_avatar_url_cache[user_id] = url _avatar_url_cache[user_id] = url
@ -143,7 +143,7 @@ class Room(blivedm.BLiveClient):
if gift.coin_type != 'gold': # 丢人 if gift.coin_type != 'gold': # 丢人
return return
self.send_message(Command.ADD_GIFT, { self.send_message(Command.ADD_GIFT, {
'avatarUrl': gift.face, 'avatarUrl': gift.face.replace('http:', '').replace('https:', ''),
'timestamp': gift.timestamp, 'timestamp': gift.timestamp,
'authorName': gift.uname, 'authorName': gift.uname,
'giftName': gift.gift_name, 'giftName': gift.gift_name,
@ -163,7 +163,7 @@ class Room(blivedm.BLiveClient):
async def _on_super_chat(self, message: blivedm.SuperChatMessage): async def _on_super_chat(self, message: blivedm.SuperChatMessage):
self.send_message(Command.ADD_SUPER_CHAT, { self.send_message(Command.ADD_SUPER_CHAT, {
'avatarUrl': message.face, 'avatarUrl': message.face.replace('http:', '').replace('https:', ''),
'timestamp': message.start_time, 'timestamp': message.start_time,
'authorName': message.uname, 'authorName': message.uname,
'price': message.price, 'price': message.price,
@ -266,7 +266,7 @@ class ChatHandler(tornado.websocket.WebSocketHandler):
# 测试用 # 测试用
def send_test_message(self): def send_test_message(self):
base_data = { base_data = {
'avatarUrl': 'https://i0.hdslb.com/bfs/face/29b6be8aa611e70a3d3ac219cdaf5e72b604f2de.jpg@48w_48h', 'avatarUrl': '//i0.hdslb.com/bfs/face/29b6be8aa611e70a3d3ac219cdaf5e72b604f2de.jpg@48w_48h',
'timestamp': time.time(), 'timestamp': time.time(),
'authorName': 'xfgryujk', 'authorName': 'xfgryujk',
} }