From eb4aa32565772f63cb1e5c179ddf07a4bebcba8f Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Sun, 22 May 2022 23:53:54 +0800 Subject: [PATCH] 'revert some file change' --- src/plugins/nonebot_bison/config_manager.py | 5 ----- src/plugins/nonebot_bison/platform/bilibili.py | 7 +------ src/plugins/nonebot_bison/plugin_config.py | 2 +- src/plugins/nonebot_bison/send.py | 15 +-------------- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index 766fb4f..7e5a3f4 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -331,11 +331,6 @@ group_manage_matcher = on_command( ) -@group_manage_matcher.handle() -async def send_group_list(bot: Bot, event: GroupMessageEvent, state: T_State): - await group_manage_matcher.finish(Message("该功能只支持私聊使用,请私聊Bot")) - - @group_manage_matcher.handle() async def send_group_list_private(bot: Bot, event: GroupMessageEvent, state: T_State): await group_manage_matcher.finish(Message("该功能只支持私聊使用,请私聊Bot")) diff --git a/src/plugins/nonebot_bison/platform/bilibili.py b/src/plugins/nonebot_bison/platform/bilibili.py index 03b3c68..ad21a8a 100644 --- a/src/plugins/nonebot_bison/platform/bilibili.py +++ b/src/plugins/nonebot_bison/platform/bilibili.py @@ -29,11 +29,8 @@ class Bilibili(NewMessage): async def get_target_name(self, target: Target) -> Optional[str]: async with httpx.AsyncClient() as client: - headers = {"content-type": "application/json", "Accept-Charset": "UTF-8"} res = await client.get( - "https://api.bilibili.com/x/space/acc/info", - params={"mid": target}, - headers=headers, + "https://api.bilibili.com/x/space/acc/info", params={"mid": target} ) res_data = json.loads(res.text) if res_data["code"]: @@ -42,12 +39,10 @@ class Bilibili(NewMessage): async def get_sub_list(self, target: Target) -> list[RawPost]: async with httpx.AsyncClient() as client: - headers = {"content-type": "application/json", "Accept-Charset": "UTF-8"} params = {"host_uid": target, "offset": 0, "need_top": 0} res = await client.get( "https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history", params=params, - headers=headers, timeout=4.0, ) res_dict = json.loads(res.text) diff --git a/src/plugins/nonebot_bison/plugin_config.py b/src/plugins/nonebot_bison/plugin_config.py index 366313b..10ded5f 100644 --- a/src/plugins/nonebot_bison/plugin_config.py +++ b/src/plugins/nonebot_bison/plugin_config.py @@ -8,7 +8,7 @@ class PlugConfig(BaseSettings): bison_use_pic: bool = False bison_init_filter: bool = True bison_use_queue: bool = True - bison_outer_url: str = "http://localhost:15556/bison/" + bison_outer_url: str = "http://localhost:8080/bison/" bison_filter_log: bool = False bison_to_me: bool = True bison_skip_browser_check: bool = False diff --git a/src/plugins/nonebot_bison/send.py b/src/plugins/nonebot_bison/send.py index 31af394..4651ed2 100644 --- a/src/plugins/nonebot_bison/send.py +++ b/src/plugins/nonebot_bison/send.py @@ -1,6 +1,5 @@ import time -from email import message -from typing import List, Literal, Union +from typing import Literal, Union from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message, MessageSegment @@ -34,18 +33,6 @@ async def _do_send( await bot.send_group_forward_msg(group_id=user, messages=msg) -async def _do_send_forward(bot: "Bot", user: str, msgs: list): - group_msg = [] - bot_info = await bot.call_api("get_login_info") # 猜测返回list 第一个为user_id,第二个为nickname - for msg in msgs: - sub_msg = { - "type": "node", - "data": {"name": f"{bot_info[0]}", "uin": f"{bot_info[1]}", "content": msg}, - } - group_msg.append(sub_msg) - await bot.call_api("send_group_forward_msg", group_id=user, message=group_msg) - - async def do_send_msgs(): global LAST_SEND_TIME if time.time() - LAST_SEND_TIME < 1.5: