suyiiyii/nonebot-bison
1
0
Fork 0
mirror of https://github.com/suyiiyii/nonebot-bison.git synced 2025-06-07 04:13:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

auto fix by pre-commit hooks

Browse Source
This commit is contained in:
pre-commit-ci[bot] 2022-03-05 18:20:12 +00:00
parent d3a782cb18
commit cb0df0528e
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/nonebot_bison/send.py
View File

@ -1,5 +1,5 @@
from email import message
import time import time
from email import message
from typing import Literal, Union from typing import Literal, Union
from nonebot.adapters import Message, MessageSegment from nonebot.adapters import Message, MessageSegment
@ -11,23 +11,19 @@ from .plugin_config import plugin_config
QUEUE = [] # 不开启图片合并转发时使用 QUEUE = [] # 不开启图片合并转发时使用
LAST_SEND_TIME = time.time() LAST_SEND_TIME = time.time()
def generate_forward_msg(
msgs:list, self_id:str, nickname:str def generate_forward_msg(msgs: list, self_id: str, nickname: str):
):
group_msg = [] group_msg = []
for msg in msgs: for msg in msgs:
sub_msg = { sub_msg = {
"type": "node", "type": "node",
"data": { "data": {"name": f"{nickname}", "uin": f"{self_id}", "content": f"{msg}"},
"name": f"{nickname}",
"uin": f"{self_id}",
"content": f"{msg}"
}
} }
group_msg.append(sub_msg) group_msg.append(sub_msg)
return group_msg return group_msg
async def _do_send( async def _do_send(
bot: "Bot", user: str, user_type: str, msg: Union[str, Message, MessageSegment] bot: "Bot", user: str, user_type: str, msg: Union[str, Message, MessageSegment]
): ):
@ -36,6 +32,7 @@ async def _do_send(
elif user_type == "private": elif user_type == "private":
await bot.call_api("send_private_msg", user_id=user, message=msg) await bot.call_api("send_private_msg", user_id=user, message=msg)
async def _do_merge_send( async def _do_merge_send(
bot: Bot, user, user_type: Literal["private", "group"], msgs: list bot: Bot, user, user_type: Literal["private", "group"], msgs: list
): ):
@ -51,10 +48,13 @@ async def _do_merge_send(
if len(msgs) == 1: # 只有一条消息序列就不合并转发 if len(msgs) == 1: # 只有一条消息序列就不合并转发
await _do_send(bot, user, user_type, msgs.pop(0)) await _do_send(bot, user, user_type, msgs.pop(0))
else: else:
group_bot_info = await bot.get_group_member_info(group_id=user,user_id=bot.self_id,no_cache=True)#调用api获取群内bot的相关参数 group_bot_info = await bot.get_group_member_info(
forward_msg = generate_forward_msg(msgs = msgs, group_id=user, user_id=bot.self_id, no_cache=True
) # 调用api获取群内bot的相关参数
forward_msg = generate_forward_msg(
msgs=msgs,
self_id=group_bot_info["user_id"], self_id=group_bot_info["user_id"],
nickname = group_bot_info["card"] nickname=group_bot_info["card"],
) # 生成合并转发内容 ) # 生成合并转发内容
await bot.send_group_forward_msg(group_id=user, messages=forward_msg) await bot.send_group_forward_msg(group_id=user, messages=forward_msg)
except Exception as e_b: # behind_msg_exception except Exception as e_b: # behind_msg_exception
@ -62,6 +62,7 @@ async def _do_merge_send(
else: else:
logger.info("成功向群{}发送合并图片转发消息".format(user)) logger.info("成功向群{}发送合并图片转发消息".format(user))
async def do_send_msgs(): async def do_send_msgs():
global LAST_SEND_TIME global LAST_SEND_TIME
if time.time() - LAST_SEND_TIME < 1.5: if time.time() - LAST_SEND_TIME < 1.5:
@ -81,7 +82,6 @@ async def do_send_msgs():
LAST_SEND_TIME = time.time() LAST_SEND_TIME = time.time()
async def send_msgs(bot: Bot, user, user_type: Literal["private", "group"], msgs: list): async def send_msgs(bot: Bot, user, user_type: Literal["private", "group"], msgs: list):
if plugin_config.bison_use_queue: if plugin_config.bison_use_queue:
if plugin_config.bison_use_pic_merge and user_type == "group": if plugin_config.bison_use_pic_merge and user_type == "group":