update 0.0.6.0

plugins/search_buff_skin_price/__init__.py

@@ -28,6 +28,19 @@ __plugin_settings__ = {
     "limit_superuser": False,
     "cmd": ["查询皮肤"],
 }
+__plugin_block_limit__ = {
+    "rst": "您有皮肤正在搜索，请稍等..."
+}
+__plugin_configs__ = {
+    "BUFF_PROXY": {
+        "value": None,
+        "help": "BUFF代理，有些厂ip可能被屏蔽"
+    },
+    "COOKIE": {
+        "value": None,
+        "help": "BUFF的账号cookie"
+    }
+}
 
 
 search_skin = on_command("查询皮肤", aliases={"皮肤查询"}, priority=5, block=True)
@@ -45,8 +58,6 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     if str(event.get_message()) in ["帮助"]:
         await search_skin.finish(__plugin_usage__)
     raw_arg = get_message_text(event.json())
-    if _ulmt.check(event.user_id):
-        await search_skin.finish("您有皮肤正在搜索，请稍等...", at_sender=True)
     if raw_arg:
         args = raw_arg.split(" ")
         if len(args) >= 2:
@@ -58,7 +69,6 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
 @search_skin.got("skin", prompt="要查询该武器的什么皮肤呢？")
 async def arg_handle(bot: Bot, event: MessageEvent, state: T_State):
     result = ""
-    _ulmt.set_true(event.user_id)
     if state["name"] in ["ak", "ak47"]:
         state["name"] = "ak-47"
     name = state["name"] + " | " + state["skin"]
@@ -67,7 +77,6 @@ async def arg_handle(bot: Bot, event: MessageEvent, state: T_State):
     except FileNotFoundError:
         await search_skin.finish(f'请先对{NICKNAME}说"设置cookie"来设置cookie！')
     if status_code in [996, 997, 998]:
-        _ulmt.set_false(event.user_id)
         await search_skin.finish(result)
     if result:
         logger.info(
@@ -75,7 +84,6 @@ async def arg_handle(bot: Bot, event: MessageEvent, state: T_State):
             f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) 查询皮肤:"
             + name
         )
-        _ulmt.set_false(event.user_id)
         await search_skin.finish(result)
     else:
         logger.info(
@@ -83,7 +91,6 @@ async def arg_handle(bot: Bot, event: MessageEvent, state: T_State):
             f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'}"
             f" 查询皮肤：{name} 没有查询到"
         )
-        _ulmt.set_false(event.user_id)
         await search_skin.finish("没有查询到哦，请检查格式吧")
 
 

plugins/search_buff_skin_price/data_source.py

@@ -1,18 +1,14 @@
 from utils.user_agent import get_user_agent
 import aiohttp
-from utils.utils import get_cookie_text
-from configs.path_config import TEXT_PATH
 from asyncio.exceptions import TimeoutError
-from configs.config import BUFF_PROXY
-from pathlib import Path
-from services.log import logger
+from configs.config import Config
 
 
 url = "https://buff.163.com/api/market/goods"
 
 
 async def get_price(dname):
-    cookie = {"session": get_cookie_text("buff")}
+    cookie = {"session": Config.get_config("search_buff_skin_price", "COOKIE")}
     name_list = []
     price_list = []
     parameter = {"game": "csgo", "page_num": "1", "search": dname}
@@ -21,7 +17,7 @@ async def get_price(dname):
             cookies=cookie, headers=get_user_agent()
         ) as session:
             async with session.get(
-                url, proxy=BUFF_PROXY, params=parameter, timeout=5
+                url, proxy=Config.get_config("search_buff_skin_price", "BUFF_PROXY"), params=parameter, timeout=5
             ) as response:
                 if response.status == 200:
                     try:
@@ -36,29 +32,21 @@ async def get_price(dname):
                                 price = data[i]["sell_reference_price"]
                                 name_list.append(name)
                                 price_list.append(price)
-                    except Exception as e:
+                    except Exception:
                         return "没有查询到...", 998
                 else:
                     return "访问失败！", response.status
-    except TimeoutError as e:
+    except TimeoutError:
         return "访问超时! 请重试或稍后再试!", 997
     result = f"皮肤: {dname}({len(name_list)})\n"
-    # result = "皮肤: " + dname + "\n"
     for i in range(len(name_list)):
         result += name_list[i] + ": " + price_list[i] + "\n"
     return result[:-1], 999
 
 
-def update_buff_cookie(cookie: str):
-    _cookie = Path(TEXT_PATH + "cookie/buff.txt")
-    try:
-        _cookie.parent.mkdir(parents=True, exist_ok=True)
-        with open(_cookie, "w") as f:
-            f.write(cookie)
-        return "更新cookie成功"
-    except Exception as e:
-        logger.error(f"更新cookie失败 e:{e}")
-        return "更新cookie失败"
+def update_buff_cookie(cookie: str) -> str:
+    Config.set_config("search_buff_skin_price", "COOKIE", cookie)
+    return "更新cookie成功"
 
 
 if __name__ == "__main__":