Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-10-11 15:00:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'HibiKier:main' into main

Browse Source
This commit is contained in:
AkashiCoin
2022-05-22 02:04:34 +08:00
committed by GitHub
parent 5fc208c95a a4bc04c958
commit d7d8efd305
14 changed files with 223 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2
View File
@@ -253,6 +253,8 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
* 优化刷屏显示设置禁言时长显示，并改为分钟 * 优化刷屏显示设置禁言时长显示，并改为分钟
* 修复了多连开箱无法指定武器箱 * 修复了多连开箱无法指定武器箱
* 修复识番链接无法正确获取 * 修复识番链接无法正确获取
* 新增真寻入群时即刻刷新权限
* 提高了微博热搜截图的等待时间
### 2022/5/19 ### 2022/5/19
basic_plugins/admin_bot_manage/_data_source.py
+2 -4
View File
@@ -232,10 +232,7 @@ async def update_member_info(group_id: int, remind_superuser: bool = False) -> b
_exist_member_list = [] _exist_member_list = []
# try: # try:
for user_info in _group_user_list: for user_info in _group_user_list:
if user_info["card"] == "": nickname = user_info["card"] or user_info["nickname"]
nickname = user_info["nickname"]
else:
nickname = user_info["card"]
async with db.transaction(): async with db.transaction():
# 更新权限 # 更新权限
if ( if (
@@ -321,3 +318,4 @@ def set_group_bot_status(group_id: int, status: bool) -> str:
# for x in group_manager.get_task_data(): # for x in group_manager.get_task_data():
# group_manager.close_group_task(group_id, x) # group_manager.close_group_task(group_id, x)
return "那我先睡觉了..." return "那我先睡觉了..."
basic_plugins/admin_bot_manage/update_group_member_info.py
+1
View File
@@ -2,6 +2,7 @@ from nonebot import on_command, on_notice
from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, GROUP, GroupIncreaseNoticeEvent from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, GROUP, GroupIncreaseNoticeEvent
from ._data_source import update_member_info from ._data_source import update_member_info
__zx_plugin_name__ = "更新群组成员列表 [Admin]" __zx_plugin_name__ = "更新群组成员列表 [Admin]"
__plugin_usage__ = """ __plugin_usage__ = """
usage： usage：
basic_plugins/group_handle/__init__.py
+19 -3
View File
@@ -1,5 +1,6 @@
from nonebot import on_notice, on_request from nonebot import on_notice, on_request
from configs.path_config import IMAGE_PATH, DATA_PATH from configs.path_config import IMAGE_PATH, DATA_PATH
from models.level_user import LevelUser
from utils.message_builder import image from utils.message_builder import image
from models.group_member_info import GroupInfoUser from models.group_member_info import GroupInfoUser
from datetime import datetime from datetime import datetime
@@ -96,6 +97,23 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
for plugin in data.keys(): for plugin in data.keys():
if not data[plugin]["default_status"]: if not data[plugin]["default_status"]:
group_manager.block_plugin(plugin, event.group_id) group_manager.block_plugin(plugin, event.group_id)
# 即刻刷新权限
for user_info in await bot.get_group_member_list(group_id=event.group_id):
if user_info["role"] in [
"owner",
"admin",
] and not await LevelUser.is_group_flag(
user_info["user_id"], event.group_id
):
await LevelUser.set_level(
user_info["user_id"],
user_info["group_id"],
Config.get_config("admin_bot_manage", "ADMIN_DEFAULT_AUTH"),
)
if str(user_info["user_id"]) in bot.config.superusers:
await LevelUser.set_level(
user_info["user_id"], user_info["group_id"], 9
)
else: else:
join_time = datetime.now() join_time = datetime.now()
user_info = await bot.get_group_member_info( user_info = await bot.get_group_member_info(
@@ -128,9 +146,7 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
msg = msg.replace("[at]", "") msg = msg.replace("[at]", "")
at_flag = True at_flag = True
if (DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg").exists(): if (DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg").exists():
img = image( img = image(DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg")
DATA_PATH / "custom_welcome_msg" / f"{event.group_id}.jpg"
)
if msg or img: if msg or img:
msg = msg.strip() + img msg = msg.strip() + img
msg = "\n" + msg if at_flag else msg msg = "\n" + msg if at_flag else msg
basic_plugins/help/data_source.py
+3
View File
@@ -56,6 +56,9 @@ def _create_help_img(
for matcher in _matchers: for matcher in _matchers:
plugin_name = None plugin_name = None
_plugin = nonebot.plugin.get_plugin(matcher.plugin_name) _plugin = nonebot.plugin.get_plugin(matcher.plugin_name)
if not _plugin:
logger.warning(f"获取 功能：{matcher.plugin_name} 失败...")
continue
_module = _plugin.module _module = _plugin.module
try: try:
plugin_name = _module.__getattribute__("__zx_plugin_name__") plugin_name = _module.__getattribute__("__zx_plugin_name__")
basic_plugins/invite_manager/__init__.py
+2 -2
View File
@@ -1,4 +1,4 @@
from nonebot import on_request, on_command from nonebot import on_request, on_message
from nonebot.adapters.onebot.v11 import ( from nonebot.adapters.onebot.v11 import (
Bot, Bot,
FriendRequestEvent, FriendRequestEvent,
@@ -25,7 +25,7 @@ __plugin_configs__ = {
friend_req = on_request(priority=5, block=True) friend_req = on_request(priority=5, block=True)
group_req = on_request(priority=5, block=True) group_req = on_request(priority=5, block=True)
x = on_command("[[test_invite_manager]]", priority=999, block=False) x = on_message(priority=999, block=False)
exists_data = {"private": {}, "group": {}} exists_data = {"private": {}, "group": {}}
basic_plugins/shop/shop_handle/data_source.py
+1
View File
@@ -13,6 +13,7 @@ import time
driver: Driver = nonebot.get_driver() driver: Driver = nonebot.get_driver()
use = require("use") use = require("use")
models/level_user.py
+6 -1
View File
@@ -1,3 +1,5 @@
from asyncpg import UniqueViolationError
from services.db_context import db from services.db_context import db
@@ -44,7 +46,8 @@ class LevelUser(db.Model):
query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id)) query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
query = query.with_for_update() query = query.with_for_update()
user = await query.gino.first() user = await query.gino.first()
if user is None: try:
if not user:
await cls.create( await cls.create(
user_qq=user_qq, user_qq=user_qq,
group_id=group_id, group_id=group_id,
@@ -55,6 +58,8 @@ class LevelUser(db.Model):
else: else:
await user.update(user_level=level, group_flag=group_flag).apply() await user.update(user_level=level, group_flag=group_flag).apply()
return False return False
except UniqueViolationError:
return False
@classmethod @classmethod
async def delete_level(cls, user_qq: int, group_id: int) -> bool: async def delete_level(cls, user_qq: int, group_id: int) -> bool:
plugins/alapi/wbtop.py
+2 -2
View File
@@ -60,8 +60,8 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
img = await AsyncPlaywright.screenshot( img = await AsyncPlaywright.screenshot(
url, url,
f"{IMAGE_PATH}/temp/wbtop_{event.user_id}.png", f"{IMAGE_PATH}/temp/wbtop_{event.user_id}.png",
"#pl_feedlist_index", "#pl_feed_main",
wait_time=5 wait_time=12
) )
if img: if img:
await wbtop.send(img) await wbtop.send(img)
plugins/parse_bilibili_json.py
+162 -167
View File
@@ -1,171 +1,166 @@
from nonebot import on_message # from nonebot import on_message
from services.log import logger # from services.log import logger
from nonebot.adapters.onebot.v11 import GroupMessageEvent # from nonebot.adapters.onebot.v11 import GroupMessageEvent
from utils.utils import get_message_json, get_local_proxy, is_number, get_message_text # from utils.utils import get_message_json, get_local_proxy, is_number, get_message_text
from nonebot.adapters.onebot.v11.permission import GROUP # from nonebot.adapters.onebot.v11.permission import GROUP
from bilibili_api import video # from utils.message_builder import image
from utils.message_builder import image # from nonebot.adapters.onebot.v11.exception import ActionFailed
from nonebot.adapters.onebot.v11.exception import ActionFailed # from utils.image_utils import BuildImage
from utils.image_utils import BuildImage # from utils.browser import get_browser
from utils.browser import get_browser # from configs.path_config import IMAGE_PATH
from configs.path_config import IMAGE_PATH # from utils.http_utils import AsyncHttpx
from utils.http_utils import AsyncHttpx # from configs.config import Config
from configs.config import Config # from utils.user_agent import get_user_agent
from utils.user_agent import get_user_agent # import aiohttp
import aiohttp # import asyncio
import asyncio # import time
import time # import ujson as json
from bilibili_api import settings #
import ujson as json #
# __zx_plugin_name__ = "B站转发解析"
# __plugin_usage__ = """
__zx_plugin_name__ = "B站转发解析" # usage：
__plugin_usage__ = """ # B站转发解析，解析b站分享信息，支持bv，bilibili链接，b站手机端转发卡片，cv，b23.tv，且5分钟内不解析相同url
usage： # """.strip()
B站转发解析，解析b站分享信息，支持bv，bilibili链接，b站手机端转发卡片，cv，b23.tv，且5分钟内不解析相同url # __plugin_des__ = "B站转发解析"
""".strip() # __plugin_type__ = ("其他",)
__plugin_des__ = "B站转发解析" # __plugin_version__ = 0.1
__plugin_type__ = ("其他",) # __plugin_author__ = "HibiKier"
__plugin_version__ = 0.1 # __plugin_task__ = {"bilibili_parse": "b站转发解析"}
__plugin_author__ = "HibiKier" # Config.add_plugin_config(
__plugin_task__ = {"bilibili_parse": "b站转发解析"} # "_task",
Config.add_plugin_config( # "DEFAULT_BILIBILI_PARSE",
"_task", # True,
"DEFAULT_BILIBILI_PARSE", # help_="被动 B站转发解析 进群默认开关状态",
True, # default_value=True,
help_="被动 B站转发解析 进群默认开关状态",
default_value=True,
)
if get_local_proxy():
settings.proxy = get_local_proxy()
parse_bilibili_json = on_message(priority=1, permission=GROUP, block=False)
_tmp = {}
@parse_bilibili_json.handle()
async def _(event: GroupMessageEvent):
vd_info = None
url = None
if get_message_json(event.json()):
try:
data = json.loads(get_message_json(event.json())[0]["data"])
except (IndexError, KeyError):
data = None
if data:
# 转发视频
if data.get("desc") == "哔哩哔哩":
async with aiohttp.ClientSession(
headers=get_user_agent()
) as session:
async with session.get(
data["meta"]["detail_1"]["qqdocurl"],
proxy=get_local_proxy(),
timeout=7,
) as response:
url = str(response.url).split("?")[0]
bvid = url.split("/")[-1]
vd_info = await video.Video(bvid=bvid).get_info()
# response = await AsyncHttpx.get(
# data["meta"]["detail_1"]["qqdocurl"], timeout=7
# ) # )
#
#
# parse_bilibili_json = on_message(priority=1, permission=GROUP, block=False)
#
# _tmp = {}
#
#
# @parse_bilibili_json.handle()
# async def _(event: GroupMessageEvent):
# vd_info = None
# url = None
# if get_message_json(event.json()):
# try:
# data = json.loads(get_message_json(event.json())[0]["data"])
# except (IndexError, KeyError):
# data = None
# if data:
# # 转发视频
# if data.get("desc") == "哔哩哔哩":
# async with aiohttp.ClientSession(
# headers=get_user_agent()
# ) as session:
# async with session.get(
# data["meta"]["detail_1"]["qqdocurl"],
# proxy=get_local_proxy(),
# timeout=7,
# ) as response:
# url = str(response.url).split("?")[0] # url = str(response.url).split("?")[0]
# bvid = url.split("/")[-1] # bvid = url.split("/")[-1]
# vd_info = await video.Video(bvid=bvid).get_info() # vd_info = await video.Video(bvid=bvid).get_info()
# 转发专栏 # # response = await AsyncHttpx.get(
if ( # # data["meta"]["detail_1"]["qqdocurl"], timeout=7
data.get("meta") # # )
and data["meta"].get("news") # # url = str(response.url).split("?")[0]
and data["meta"]["news"].get("desc") == "哔哩哔哩专栏" # # bvid = url.split("/")[-1]
): # # vd_info = await video.Video(bvid=bvid).get_info()
url = data["meta"]["news"]["jumpUrl"] # # 转发专栏
page = None # if (
try: # data.get("meta")
browser = await get_browser() # and data["meta"].get("news")
if not browser: # and data["meta"]["news"].get("desc") == "哔哩哔哩专栏"
return # ):
page = await browser.new_page( # url = data["meta"]["news"]["jumpUrl"]
user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36" # page = None
" (KHTML, like Gecko) Chrome/93.0.4530.0 Safari/537.36" # try:
) # browser = await get_browser()
await page.goto(url, wait_until="networkidle", timeout=10000) # if not browser:
await page.set_viewport_size({"width": 2560, "height": 1080}) # return
await page.click("#app > div") # page = await browser.new_page(
div = await page.query_selector("#app > div") # user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
await div.screenshot( # " (KHTML, like Gecko) Chrome/93.0.4530.0 Safari/537.36"
path=f"{IMAGE_PATH}/temp/cv_{event.user_id}.png", # )
timeout=100000, # await page.goto(url, wait_until="networkidle", timeout=10000)
) # await page.set_viewport_size({"width": 2560, "height": 1080})
await asyncio.get_event_loop().run_in_executor( # await page.click("#app > div")
None, resize, f"{IMAGE_PATH}/temp/cv_{event.user_id}.png" # div = await page.query_selector("#app > div")
) # await div.screenshot(
await parse_bilibili_json.send( # path=f"{IMAGE_PATH}/temp/cv_{event.user_id}.png",
"[[_task|bilibili_parse]]" + image(f"cv_{event.user_id}.png", "temp") # timeout=100000,
) # )
await page.close() # await asyncio.get_event_loop().run_in_executor(
logger.info( # None, resize, f"{IMAGE_PATH}/temp/cv_{event.user_id}.png"
f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}" # )
) # await parse_bilibili_json.send(
except Exception as e: # "[[_task|bilibili_parse]]" + image(f"cv_{event.user_id}.png", "temp")
logger.error(f"尝试解析bilibili专栏 {url} 失败 {type(e)}：{e}") # )
if page: # await page.close()
await page.close() # logger.info(
return # f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
# BV # )
if msg := get_message_text(event.json()): # except Exception as e:
if "BV" in msg: # logger.error(f"尝试解析bilibili专栏 {url} 失败 {type(e)}：{e}")
index = msg.find("BV") # if page:
if len(msg[index + 2 :]) >= 10: # await page.close()
msg = msg[index : index + 12] # return
url = f"https://www.bilibili.com/video/{msg}" # # BV
vd_info = await video.Video(bvid=msg).get_info() # if msg := get_message_text(event.json()):
elif "av" in msg: # if "BV" in msg:
index = msg.find("av") # index = msg.find("BV")
if len(msg[index + 2 :]) >= 9: # if len(msg[index + 2 :]) >= 10:
msg = msg[index + 2 : index + 11] # msg = msg[index : index + 12]
if is_number(msg): # url = f"https://www.bilibili.com/video/{msg}"
url = f"https://www.bilibili.com/video/{msg}" # vd_info = await video.Video(bvid=msg).get_info()
vd_info = await video.Video(aid=int(msg)).get_info() # elif "av" in msg:
elif "https://b23.tv" in msg: # index = msg.find("av")
url = "https://" + msg[msg.find("b23.tv") : msg.find("b23.tv") + 13] # if len(msg[index + 2 :]) >= 9:
res = await AsyncHttpx.get(url, timeout=7) # msg = msg[index + 2 : index + 11]
url = str(res.url).split("?")[0] # if is_number(msg):
bvid = url.split("/")[-1] # url = f"https://www.bilibili.com/video/{msg}"
vd_info = await video.Video(bvid=bvid).get_info() # vd_info = await video.Video(aid=int(msg)).get_info()
if vd_info: # elif "https://b23.tv" in msg:
if ( # url = "https://" + msg[msg.find("b23.tv") : msg.find("b23.tv") + 13]
url in _tmp.keys() and time.time() - _tmp[url] > 30 # res = await AsyncHttpx.get(url, timeout=7)
) or url not in _tmp.keys(): # url = str(res.url).split("?")[0]
_tmp[url] = time.time() # bvid = url.split("/")[-1]
aid = vd_info["aid"] # vd_info = await video.Video(bvid=bvid).get_info()
title = vd_info["title"] # if vd_info:
author = vd_info["owner"]["name"] # if (
reply = vd_info["stat"]["reply"] # 回复 # url in _tmp.keys() and time.time() - _tmp[url] > 30
favorite = vd_info["stat"]["favorite"] # 收藏 # ) or url not in _tmp.keys():
coin = vd_info["stat"]["coin"] # 投币 # _tmp[url] = time.time()
# like = vd_info['stat']['like'] # 点赞 # aid = vd_info["aid"]
# danmu = vd_info['stat']['danmaku'] # 弹幕 # title = vd_info["title"]
date = time.strftime("%Y-%m-%d", time.localtime(vd_info["ctime"])) # author = vd_info["owner"]["name"]
try: # reply = vd_info["stat"]["reply"] # 回复
await parse_bilibili_json.send( # favorite = vd_info["stat"]["favorite"] # 收藏
"[[_task|bilibili_parse]]" + # coin = vd_info["stat"]["coin"] # 投币
image(vd_info["pic"]) + f"\nav{aid}\n标题：{title}\n" # # like = vd_info['stat']['like'] # 点赞
f"UP：{author}\n" # # danmu = vd_info['stat']['danmaku'] # 弹幕
f"上传日期：{date}\n" # date = time.strftime("%Y-%m-%d", time.localtime(vd_info["ctime"]))
f"回复：{reply}，收藏：{favorite}，投币：{coin}\n" # try:
f"{url}" # await parse_bilibili_json.send(
) # "[[_task|bilibili_parse]]" +
except ActionFailed: # image(vd_info["pic"]) + f"\nav{aid}\n标题：{title}\n"
logger.warning(f"{event.group_id} 发送bilibili解析失败") # f"UP：{author}\n"
else: # f"上传日期：{date}\n"
logger.info( # f"回复：{reply}，收藏：{favorite}，投币：{coin}\n"
f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}" # f"{url}"
) # )
# except ActionFailed:
# logger.warning(f"{event.group_id} 发送bilibili解析失败")
def resize(path: str): # else:
A = BuildImage(0, 0, background=path, ratio=0.5) # logger.info(
A.save(path) # f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
# )
#
#
# def resize(path: str):
# A = BuildImage(0, 0, background=path, ratio=0.5)
# A.save(path)
plugins/pid_search.py
+2
View File
@@ -68,6 +68,8 @@ async def _g(event: MessageEvent, state: T_State, pid: str = Arg("pid")):
except Exception as e: except Exception as e:
await pid_search.finish(f"发生了一些错误..{type(e)}：{e}") await pid_search.finish(f"发生了一些错误..{type(e)}：{e}")
else: else:
if data.get("error"):
await pid_search.finish(data["error"]["user_message"], at_sender=True)
data = data["illust"] data = data["illust"]
if not data["width"] and not data["height"]: if not data["width"] and not data["height"]:
await pid_search.finish(f"没有搜索到 PID：{pid} 的图片", at_sender=True) await pid_search.finish(f"没有搜索到 PID：{pid} 的图片", at_sender=True)
plugins/weather/__init__.py
+3 -3
View File
@@ -12,7 +12,7 @@ __plugin_usage__ = """
usage： usage：
普普通通的查天气吧 普普通通的查天气吧
指令： 指令：
[城市]天气/天气[城市] [城市]天气
""".strip() """.strip()
__plugin_des__ = "出门要看看天气，不要忘了带伞" __plugin_des__ = "出门要看看天气，不要忘了带伞"
__plugin_cmd__ = ["[城市]天气/天气[城市]"] __plugin_cmd__ = ["[城市]天气/天气[城市]"]
@@ -27,13 +27,13 @@ __plugin_settings__ = {
} }
weather = on_regex(r".{0,10}?(.*)的?天气.*?.{0,10}", priority=5, block=True) weather = on_regex(r".{0,10}?(.*)的?天气.{0,10}", priority=5, block=True)
@weather.handle() @weather.handle()
async def _(event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()): async def _(event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()):
msg = reg_group[0] msg = reg_group[0]
if msg[-1] != "市": if msg and msg[-1] != "市":
msg += "市" msg += "市"
city = "" city = ""
if msg: if msg:
plugins/word_clouds/__init__.py
+1 -1
View File
@@ -60,7 +60,7 @@ wordcloud_cmd = on_command(
"我的本月词云", "我的本月词云",
"我的年度词云", "我的年度词云",
"我的历史词云", "我的历史词云",
}, priority=5, }, block=True, priority=5
) )
Config.add_plugin_config( Config.add_plugin_config(
"word_clouds", "word_clouds",
utils/http_utils.py
+2 -2
View File
@@ -327,14 +327,14 @@ class AsyncPlaywright:
await page.set_viewport_size(viewport_size) await page.set_viewport_size(viewport_size)
if isinstance(element, str): if isinstance(element, str):
if wait_time: if wait_time:
card = await page.wait_for_selector(element, timeout=wait_time) card = await page.wait_for_selector(element, timeout=wait_time * 1000)
else: else:
card = await page.query_selector(element) card = await page.query_selector(element)
else: else:
card = page card = page
for e in element: for e in element:
if wait_time: if wait_time:
card = await card.wait_for_selector(e, timeout=wait_time) card = await card.wait_for_selector(e, timeout=wait_time * 1000)
else: else:
card = await card.query_selector(e) card = await card.query_selector(e)
await card.screenshot(path=path, timeout=timeout, type=type_) await card.screenshot(path=path, timeout=timeout, type=type_)