mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-30 01:00:02 +08:00
重构webui主页与好友/群组api
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
from nonebot import on_message
|
||||
from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageEvent
|
||||
from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageEvent
|
||||
|
||||
from configs.config import Config
|
||||
from models.chat_history import ChatHistory
|
||||
@@ -32,7 +32,7 @@ TEMP_LIST = []
|
||||
|
||||
|
||||
@chat_history.handle()
|
||||
async def _(event: MessageEvent, msg: str = PlaintText()):
|
||||
async def _(bot: Bot, event: MessageEvent, msg: str = PlaintText()):
|
||||
group_id = None
|
||||
if isinstance(event, GroupMessageEvent):
|
||||
group_id = str(event.group_id)
|
||||
@@ -42,6 +42,7 @@ async def _(event: MessageEvent, msg: str = PlaintText()):
|
||||
group_id=group_id,
|
||||
text=str(event.get_message()),
|
||||
plain_text=msg,
|
||||
bot_id=str(bot.self_id),
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@@ -58,9 +58,12 @@ async def _(bot: Bot, event: FriendRequestEvent):
|
||||
if Config.get_config("invite_manager", "AUTO_ADD_FRIEND"):
|
||||
logger.debug(f"已开启好友请求自动同意,成功通过该请求", "好友请求", target=event.user_id)
|
||||
await bot.set_friend_add_request(flag=event.flag, approve=True)
|
||||
await FriendUser.create(user_id=str(user["user_id"]), user_name=user["nickname"])
|
||||
await FriendUser.create(
|
||||
user_id=str(user["user_id"]), user_name=user["nickname"]
|
||||
)
|
||||
else:
|
||||
requests_manager.add_request(
|
||||
str(bot.self_id),
|
||||
event.user_id,
|
||||
"private",
|
||||
event.flag,
|
||||
@@ -126,6 +129,7 @@ async def _(bot: Bot, event: GroupRequestEvent):
|
||||
"等待管理员处理吧!",
|
||||
)
|
||||
requests_manager.add_request(
|
||||
str(bot.self_id),
|
||||
event.user_id,
|
||||
"group",
|
||||
event.flag,
|
||||
|
||||
Reference in New Issue
Block a user