Skip to content

Commit 776f629

Browse files
committed
fix User-Agent
1 parent d9e9edb commit 776f629

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

app/api/endpoints/system.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def fetch_image(
9595
# 请求远程图片
9696
referer = "https://movie.douban.com/" if "doubanio.com" in url else None
9797
proxies = settings.PROXY if proxy else None
98-
response = RequestUtils(ua=settings.USER_AGENT, proxies=proxies, referer=referer,
98+
response = RequestUtils(ua=settings.NORMAL_USER_AGENT, proxies=proxies, referer=referer,
9999
accept_type="image/avif,image/webp,image/apng,*/*").get_res(url=url)
100100
if not response:
101101
raise HTTPException(status_code=502, detail="Failed to fetch the image from the remote server")
@@ -490,7 +490,7 @@ def nettest(
490490
proxies=settings.PROXY if proxy else None,
491491
headers=headers,
492492
timeout=10,
493-
ua=settings.USER_AGENT,
493+
ua=settings.NORMAL_USER_AGENT,
494494
).get_res(url)
495495
# 计时结束的毫秒数
496496
end_time = datetime.now()

app/chain/media.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def __download_image(_url: str) -> Optional[bytes]:
454454
"""
455455
try:
456456
logger.info(f"正在下载图片:{_url} ...")
457-
r = RequestUtils(proxies=settings.PROXY, ua=settings.USER_AGENT).get_res(url=_url)
457+
r = RequestUtils(proxies=settings.PROXY, ua=settings.NORMAL_USER_AGENT).get_res(url=_url)
458458
if r:
459459
return r.content
460460
else:

app/chain/recommend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def __fetch_and_save_image(url: str):
130130
# 请求远程图片
131131
referer = "https://movie.douban.com/" if "doubanio.com" in url else None
132132
proxies = settings.PROXY if not referer else None
133-
response = RequestUtils(ua=settings.USER_AGENT, proxies=proxies, referer=referer).get_res(url=url)
133+
response = RequestUtils(ua=settings.NORMAL_USER_AGENT, proxies=proxies, referer=referer).get_res(url=url)
134134
if not response:
135135
logger.debug(f"Empty response for URL: {url}")
136136
return

app/core/config.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,13 @@ def USER_AGENT(self) -> str:
517517
"""
518518
return f"{self.PROJECT_NAME}/{APP_VERSION[1:]} ({platform.system()} {platform.release()}; {SystemUtils.cpu_arch()})"
519519

520+
@property
521+
def NORMAL_USER_AGENT(self) -> str:
522+
"""
523+
默认浏览器用户代理字符串
524+
"""
525+
return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36"
526+
520527
@property
521528
def INNER_CONFIG_PATH(self):
522529
return self.ROOT_PATH / "config"
@@ -613,7 +620,7 @@ def GITHUB_HEADERS(self):
613620
if self.GITHUB_TOKEN:
614621
return {
615622
"Authorization": f"Bearer {self.GITHUB_TOKEN}",
616-
"User-Agent": self.USER_AGENT,
623+
"User-Agent": self.NORMAL_USER_AGENT,
617624
}
618625
return {}
619626

@@ -642,7 +649,7 @@ def REPO_GITHUB_HEADERS(self, repo: str = None):
642649
continue
643650
headers[repo_info] = {
644651
"Authorization": f"Bearer {token}",
645-
"User-Agent": self.USER_AGENT,
652+
"User-Agent": self.NORMAL_USER_AGENT,
646653
}
647654
except Exception as e:
648655
print(f"处理令牌对 '{token_pair}' 时出错: {e}")

app/modules/douban/apiv2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def __post(self, url: str, **kwargs) -> dict:
234234
if '_ts' in params:
235235
params.pop('_ts')
236236
resp = RequestUtils(
237-
ua=settings.USER_AGENT,
237+
ua=settings.NORMAL_USER_AGENT,
238238
session=self._session,
239239
).post_res(url=req_url, data=params)
240240
if resp is not None and resp.status_code == 400 and "rate_limit" in resp.text:

app/modules/telegram/telegram.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ def __send_request(self, userid: Optional[str] = None, image="", caption="",
524524
:param reply_markup: 内联键盘
525525
"""
526526
if image:
527-
res = RequestUtils(proxies=settings.PROXY, ua=settings.USER_AGENT).get_res(image)
527+
res = RequestUtils(proxies=settings.PROXY, ua=settings.NORMAL_USER_AGENT).get_res(image)
528528
if res is None:
529529
raise Exception("获取图片失败")
530530
if res.content:

app/modules/themoviedb/tmdbapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ def match_web(self, name: str, mtype: MediaType) -> Optional[dict]:
514514
return {}
515515
logger.info("正在从TheDbMovie网站查询:%s ..." % name)
516516
tmdb_url = "https://www.themoviedb.org/search?query=%s" % quote(name)
517-
res = RequestUtils(timeout=5, ua=settings.USER_AGENT, proxies=settings.PROXY).get_res(url=tmdb_url)
517+
res = RequestUtils(timeout=5, ua=settings.NORMAL_USER_AGENT, proxies=settings.PROXY).get_res(url=tmdb_url)
518518
if res is None:
519519
return None
520520
if res.status_code == 429:

0 commit comments

Comments
 (0)