From b98a8f6680f187d5c9c3e65a3120b9ce51d07955 Mon Sep 17 00:00:00 2001
From: John Smith <xfgryujk@126.com>
Date: Thu, 6 Jul 2023 23:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcookie=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E8=8E=B7=E5=8F=96=E5=A4=B4=E5=83=8F=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/chat.py        |  1 -
 services/avatar.py |  4 +++-
 utils/request.py   | 12 +-----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/api/chat.py b/api/chat.py
index ee05414..f76eed6 100644
--- a/api/chat.py
+++ b/api/chat.py
@@ -312,7 +312,6 @@ class RoomInfoHandler(api.base.ApiHandler):  # noqa
                     'Origin': 'https://live.bilibili.com',
                     'Referer': f'https://live.bilibili.com/{room_id}'
                 },
-                cookies=utils.request.BILIBILI_COMMON_COOKIES,
                 params={
                     'room_id': room_id
                 }
diff --git a/services/avatar.py b/services/avatar.py
index 1cbd585..f76612c 100644
--- a/services/avatar.py
+++ b/services/avatar.py
@@ -55,6 +55,9 @@ async def get_avatar_url(user_id):
 
 
 async def get_avatar_url_or_none(user_id):
+    if user_id == 0:
+        return None
+
     avatar_url = get_avatar_url_from_memory(user_id)
     if avatar_url is not None:
         return avatar_url
@@ -169,7 +172,6 @@ async def _do_get_avatar_url_from_web(user_id):
                 'Origin': 'https://space.bilibili.com',
                 'Referer': f'https://space.bilibili.com/{user_id}/'
             },
-            cookies=utils.request.BILIBILI_COMMON_COOKIES,
             params=_add_wbi_sign({'mid': user_id}),
         ) as r:
             if r.status != 200:
diff --git a/utils/request.py b/utils/request.py
index 13c6d38..fc329a0 100644
--- a/utils/request.py
+++ b/utils/request.py
@@ -5,18 +5,8 @@ import aiohttp
 BILIBILI_COMMON_HEADERS = {
     'Origin': 'https://www.bilibili.com',
     'Referer': 'https://www.bilibili.com/',
-    'Sec-CH-UA': '"Google Chrome";v="105", "Not)A;Brand";v="8", "Chromium";v="105"',
-    'Sec-CH-UA-Mobile': '?0',
-    'Sec-CH-UA-Platform': '"Windows"',
-    'Sec-Fetch-Dest': 'empty',
-    'Sec-Fetch-Mode': 'cors',
-    'Sec-Fetch-Site': 'same-site',
     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko)'
-                  ' Chrome/105.0.0.0 Safari/537.36'
-}
-BILIBILI_COMMON_COOKIES = {
-    'b_lsid': '639B17D4_9876590D28',
-    '_uuid': '883B5256-A359-E4A3-7159-123456794937E96237infoc'
+                  ' Chrome/114.0.0.0 Safari/537.36'
 }
 
 http_session = aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=10))