From ac794efd18378b72a63e4a38f1e1e7062431dc2b Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Mon, 28 Oct 2024 23:09:03 +0800 Subject: [PATCH] =?UTF-8?q?:refactor:=20=E5=B0=86=20cookie=20default=5Fcd?= =?UTF-8?q?=20=E7=A7=BB=E5=8A=A8=E5=88=B0=20CookieSite=20=E5=86=85?= =?UTF-8?q?=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot_bison/platform/bilibili/scheduler.py | 2 +- nonebot_bison/platform/weibo.py | 3 ++- nonebot_bison/utils/site.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nonebot_bison/platform/bilibili/scheduler.py b/nonebot_bison/platform/bilibili/scheduler.py index 060e72e..3685249 100644 --- a/nonebot_bison/platform/bilibili/scheduler.py +++ b/nonebot_bison/platform/bilibili/scheduler.py @@ -27,7 +27,6 @@ class BilibiliClientManager(CookieClientManager): _inited: bool = False _site_name: str = "bilibili.com" - _default_cd: int = timedelta(seconds=120) def __init__(self) -> None: self._client = http_client() @@ -97,6 +96,7 @@ class BilibiliSite(CookieSite): schedule_type = "interval" client_mgr = BilibiliClientManager require_browser = True + default_cd: int = timedelta(seconds=120) class BililiveSite(Site): diff --git a/nonebot_bison/platform/weibo.py b/nonebot_bison/platform/weibo.py index 7d65394..7173374 100644 --- a/nonebot_bison/platform/weibo.py +++ b/nonebot_bison/platform/weibo.py @@ -1,8 +1,8 @@ import re import json from typing import Any -from datetime import datetime from urllib.parse import unquote +from datetime import datetime, timedelta from yarl import URL from lxml.etree import HTML @@ -41,6 +41,7 @@ class WeiboSite(CookieSite): schedule_type = "interval" schedule_setting = {"seconds": 3} client_mgr = create_cookie_client_manager(name) + default_cd: int = timedelta(seconds=15) @classmethod async def _get_current_user_name(cls, cookies: dict) -> str: diff --git a/nonebot_bison/utils/site.py b/nonebot_bison/utils/site.py index 97ba844..1827624 100644 --- a/nonebot_bison/utils/site.py +++ b/nonebot_bison/utils/site.py @@ -44,7 +44,6 @@ class DefaultClientManager(ClientManager): class CookieClientManager(ClientManager): _site_name: str # 绑定的 site_name,需要使用 create_cookie_client_manager 创建 Client_mgr 时绑定 - _default_cd: int = timedelta(seconds=10) @classmethod async def _generate_anonymous_cookie(cls) -> Cookie: @@ -83,7 +82,7 @@ class CookieClientManager(ClientManager): raise ValueError() cookie = Cookie(site_name=cls._site_name, content=content) cookie.cookie_name = cookie_name if cookie_name else await cookie_site.get_cookie_name(content) - cookie.cd = cls._default_cd + cookie.cd = cookie_site.default_cd cookie_id = await config.add_cookie(cookie) return await config.get_cookie_by_id(cookie_id) @@ -166,6 +165,7 @@ class Site(metaclass=RegistryMeta, base=True): class CookieSite(Site): client_mgr: type[CookieClientManager] = CookieClientManager + default_cd: int = timedelta(seconds=10) @classmethod async def get_cookie_name(cls, content: str) -> str: