/role_combat + [幕数/all] + [pre]
\n(pre
表示上期)\n\n"
+ "文本格式:\n幻想真境剧诗数据 + 查询/总览 + [上期] + [幕数]
\n\n"
+ "例如以下指令都正确:\n"
+ "/role_combat
\n/role_combat 6 pre
\n/role_combat all pre
\n"
+ "幻想真境剧诗数据查询
\n幻想真境剧诗数据查询上期第6幕
\n幻想真境剧诗数据总览上期
",
+ parse_mode=ParseMode.HTML,
+ )
+ self.log_user(update, logger.info, "查询[bold]幻想真境剧诗挑战数据[/bold]帮助", extra={"markup": True})
+ return
+
+ # 解析参数
+ floor, total, previous = get_args(" ".join([i for i in args if not i.startswith("@")]))
+
+ if floor > 8 or floor < 0:
+ reply_msg = await message.reply_text("幻想真境剧诗幕数输入错误,请重新输入。支持的参数为: 1-8 或 all")
+ if filters.ChatType.GROUPS.filter(message):
+ self.add_delete_message_job(reply_msg)
+ self.add_delete_message_job(message)
+ return
+
+ self.log_user(
+ update,
+ logger.info,
+ "[bold]幻想真境剧诗挑战数据[/bold]请求: floor=%s total=%s previous=%s",
+ floor,
+ total,
+ previous,
+ extra={"markup": True},
+ )
+
+ await message.reply_chat_action(ChatAction.TYPING)
+
+ reply_text: Optional[Message] = None
+
+ if total:
+ reply_text = await message.reply_text(
+ f"{config.notice.bot_name}需要时间整理幻想真境剧诗数据,还请耐心等待哦~"
+ )
+ try:
+ async with self.helper.genshin_or_public(user_id, uid=uid, offset=offset) as client:
+ if not client.public:
+ await client.get_record_cards()
+ abyss_data, avatar_data = await self.get_rendered_pic_data(client, client.player_id, previous)
+ images = await self.get_rendered_pic(abyss_data, avatar_data, client.player_id, floor, total)
+ except AbyssUnlocked: # 若幻想真境剧诗未解锁
+ await message.reply_text("还未解锁幻想真境剧诗哦~")
+ return
+ except NoMostKills: # 若幻想真境剧诗还未挑战
+ await message.reply_text("还没有挑战本次幻想真境剧诗呢,咕咕咕~")
+ return
+ except FloorNotFoundError:
+ await message.reply_text("幻想真境剧诗详细数据未找到,咕咕咕~")
+ return
+ except AbyssNotFoundError:
+ await message.reply_text("无法查询玩家挑战队伍详情,只能查询统计详情哦~")
+ return
+ except TooManyRequestPublicCookies:
+ reply_message = await message.reply_text("查询次数太多,请您稍后重试")
+ if filters.ChatType.GROUPS.filter(message):
+ self.add_delete_message_job(reply_message)
+ self.add_delete_message_job(message)
+ return
+ finally:
+ if reply_text is not None:
+ await reply_text.delete()
+
+ if images is None:
+ await message.reply_text(f"还没有第 {floor} 幕的挑战数据")
+ return
+
+ await message.reply_chat_action(ChatAction.UPLOAD_PHOTO)
+
+ for group in ArkoWrapper(images).group(10): # 每 10 张图片分一个组
+ await RenderGroupResult(results=group).reply_media_group(message, write_timeout=60)
+
+ self.log_user(update, logger.info, "[bold]幻想真境剧诗挑战数据[/bold]: 成功发送图片", extra={"markup": True})
+
+ async def get_rendered_pic_data(
+ self, client: GenshinClient, uid: int, previous: bool
+ ) -> Tuple["ImgTheaterData", Dict[int, int]]:
+ abyss_data = await client.get_genshin_imaginarium_theater(
+ uid, need_detail=not client.public, previous=previous, lang="zh-cn"
+ ) # noqa
+ avatar_data = {}
+ if (not abyss_data.unlocked) or (not abyss_data.data):
+ raise AbyssUnlocked
+ abyss_data = abyss_data.data[0]
+ if not client.public: # noqa
+ avatars = await client.get_genshin_characters(uid, lang="zh-cn")
+ avatar_data = {i.id: i.constellation for i in avatars}
+ if abyss_data.has_data and abyss_data.has_detail_data and abyss_data.detail:
+ await self.save_abyss_data(self.history_data_abyss, uid, abyss_data, avatar_data)
+ return abyss_data, avatar_data
+
+ async def get_rendered_pic( # skipcq: PY-R1000 #
+ self, abyss_data: "ImgTheaterData", avatar_data: Dict[int, int], uid: int, floor: int, total: bool
+ ) -> Union[Tuple[Any], List[RenderResult], None]:
+ """
+ 获取渲染后的图片
+
+ Args:
+ abyss_data (ImgTheaterData): 幻想真境剧诗数据
+ avatar_data (Dict[int, int]): 角色数据
+ uid (int): 需要查询的 uid
+ floor (int): 幕数
+ total (bool): 是否为总览
+
+ Returns:
+ bytes格式的图片
+ """
+
+ if (total or (floor > 0)) and (not abyss_data.detail or len(abyss_data.detail.rounds_data) == 0):
+ raise FloorNotFoundError
+ if (total or (floor > 0)) and not abyss_data.detail:
+ raise AbyssNotFoundError
+
+ start_time = abyss_data.schedule.start_time.astimezone(TZ)
+ time = start_time.strftime("%Y年%m月")
+
+ render_data = {
+ "time": time,
+ "stat": abyss_data.stat,
+ "uid": mask_number(uid),
+ "floor_colors": {
+ 1: "#374952",
+ 2: "#374952",
+ 3: "#55464B",
+ 4: "#55464B",
+ 5: "#55464B",
+ 6: "#1D2A5D",
+ 7: "#1D2A5D",
+ 8: "#1D2A5D",
+ 9: "#292B58",
+ 10: "#382024",
+ 11: "#252550",
+ 12: "#1D2A4A",
+ },
+ }
+
+ if total:
+ render_data["avatar_data"] = avatar_data
+ render_inputs: List[Tuple[int, Coroutine[Any, Any, RenderResult]]] = []
+
+ def overview_task():
+ return -1, self.template_service.render(
+ "genshin/role_combat/overview.jinja2", render_data, viewport={"width": 750, "height": 320}
+ )
+
+ def floor_task(floor_index: int):
+ floor_d = abyss_data.detail.rounds_data[floor_index]
+ return (
+ floor_d.round_id,
+ self.template_service.render(
+ "genshin/role_combat/floor.jinja2",
+ {
+ **render_data,
+ "floor": floor_d,
+ "floor_time": floor_d.finish_time.astimezone(TZ).strftime("%Y-%m-%d %H:%M:%S"),
+ },
+ viewport={"width": 690, "height": 500},
+ full_page=True,
+ ttl=15 * 24 * 60 * 60,
+ ),
+ )
+
+ render_inputs.append(overview_task())
+
+ for i, _ in enumerate(abyss_data.detail.rounds_data):
+ render_inputs.append(floor_task(i))
+
+ render_group_inputs = list(map(lambda x: x[1], sorted(render_inputs, key=lambda x: x[0])))
+
+ return await asyncio.gather(*render_group_inputs)
+
+ if floor < 1:
+ return [
+ await self.template_service.render(
+ "genshin/role_combat/overview.jinja2", render_data, viewport={"width": 750, "height": 320}
+ )
+ ]
+ if not (floor_data := list(filter(lambda x: x.round_id == floor, abyss_data.detail.rounds_data))):
+ return None
+ render_data["avatar_data"] = avatar_data
+ render_data["floor"] = floor_data[0]
+ render_data["floor_time"] = floor_data[0].finish_time.astimezone(TZ).strftime("%Y-%m-%d %H:%M:%S")
+ return [
+ await self.template_service.render(
+ "genshin/role_combat/floor.jinja2", render_data, viewport={"width": 690, "height": 500}
+ )
+ ]
+
+ @staticmethod
+ async def save_abyss_data(
+ history_data_abyss: "HistoryDataImgTheaterServices",
+ uid: int,
+ abyss_data: "ImgTheaterData",
+ character_data: Dict[int, int],
+ ) -> bool:
+ model = history_data_abyss.create(uid, abyss_data, character_data)
+ old_data = await history_data_abyss.get_by_user_id_data_id(uid, model.data_id)
+ exists = history_data_abyss.exists_data(model, old_data)
+ if not exists:
+ await history_data_abyss.add(model)
+ return True
+ return False
+
+ async def get_abyss_data(self, uid: int):
+ return await self.history_data_abyss.get_by_user_id(uid)
+
+ @staticmethod
+ def get_season_data_name(data: "HistoryDataImgTheater"):
+ start_time = data.abyss_data.schedule.start_time.astimezone(TZ)
+ time = start_time.strftime("%Y.%m ")[2:]
+ honor = ""
+ if data.abyss_data.stat.difficulty == TheaterDifficulty.EASY:
+ diff = "简单"
+ elif data.abyss_data.stat.difficulty == TheaterDifficulty.NORMAL:
+ diff = "普通"
+ else:
+ diff = "困难"
+ if data.abyss_data.stat.medal_num == 8 and data.abyss_data.stat.difficulty == TheaterDifficulty.HARD:
+ honor = "👑"
+
+ return f"{time} {data.abyss_data.stat.medal_num} ★ {diff} {honor}"
+
+ async def get_session_button_data(self, user_id: int, uid: int, force: bool = False):
+ redis = await self.cache.get(str(uid))
+ if redis and not force:
+ return redis["buttons"]
+ data = await self.get_abyss_data(uid)
+ data.sort(key=lambda x: x.id, reverse=True)
+ abyss_data = [HistoryDataImgTheater.from_data(i) for i in data]
+ buttons = [
+ {
+ "name": RoleCombatPlugin.get_season_data_name(abyss_data[idx]),
+ "value": f"get_role_combat_history|{user_id}|{uid}|{value.id}",
+ }
+ for idx, value in enumerate(data)
+ ]
+ await self.cache.set(str(uid), {"buttons": buttons})
+ return buttons
+
+ async def gen_season_button(
+ self,
+ user_id: int,
+ uid: int,
+ page: int = 1,
+ ) -> List[List[InlineKeyboardButton]]:
+ """生成按钮"""
+ data = await self.get_session_button_data(user_id, uid)
+ if not data:
+ return []
+ buttons = [
+ InlineKeyboardButton(
+ value["name"],
+ callback_data=value["value"],
+ )
+ for value in data
+ ]
+ all_buttons = [buttons[i : i + 3] for i in range(0, len(buttons), 3)]
+ send_buttons = all_buttons[(page - 1) * 5 : page * 5]
+ last_page = page - 1 if page > 1 else 0
+ all_page = math.ceil(len(all_buttons) / 5)
+ next_page = page + 1 if page < all_page and all_page > 1 else 0
+ last_button = []
+ if last_page:
+ last_button.append(
+ InlineKeyboardButton(
+ "<< 上一页",
+ callback_data=f"get_role_combat_history|{user_id}|{uid}|p_{last_page}",
+ )
+ )
+ if last_page or next_page:
+ last_button.append(
+ InlineKeyboardButton(
+ f"{page}/{all_page}",
+ callback_data=f"get_role_combat_history|{user_id}|{uid}|empty_data",
+ )
+ )
+ if next_page:
+ last_button.append(
+ InlineKeyboardButton(
+ "下一页 >>",
+ callback_data=f"get_role_combat_history|{user_id}|{uid}|p_{next_page}",
+ )
+ )
+ if last_button:
+ send_buttons.append(last_button)
+ return send_buttons
+
+ @staticmethod
+ async def gen_floor_button(
+ data_id: int,
+ abyss_data: "HistoryDataImgTheater",
+ user_id: int,
+ uid: int,
+ ) -> List[List[InlineKeyboardButton]]:
+ floors = [i.round_id for i in abyss_data.abyss_data.detail.rounds_data if i.round_id]
+ floors.sort()
+ buttons = [
+ InlineKeyboardButton(
+ f"第 {i} 幕",
+ callback_data=f"get_role_combat_history|{user_id}|{uid}|{data_id}|{i}",
+ )
+ for i in floors
+ ]
+ send_buttons = [buttons[i : i + 4] for i in range(0, len(buttons), 4)]
+ all_buttons = [
+ InlineKeyboardButton(
+ "<< 返回",
+ callback_data=f"get_role_combat_history|{user_id}|{uid}|p_1",
+ ),
+ InlineKeyboardButton(
+ "总览",
+ callback_data=f"get_role_combat_history|{user_id}|{uid}|{data_id}|total",
+ ),
+ InlineKeyboardButton(
+ "所有",
+ callback_data=f"get_role_combat_history|{user_id}|{uid}|{data_id}|all",
+ ),
+ ]
+ send_buttons.append(all_buttons)
+ return send_buttons
+
+ @handler.command("role_combat_history", block=False)
+ @handler.message(filters.Regex(r"^幻想真境剧诗历史数据"), block=False)
+ async def abyss_history_command_start(self, update: Update, _: CallbackContext) -> None:
+ user_id = await self.get_real_user_id(update)
+ uid, offset = self.get_real_uid_or_offset(update)
+ message = update.effective_message
+ self.log_user(update, logger.info, "查询幻想真境剧诗历史数据")
+
+ async with self.helper.genshin_or_public(user_id, uid=uid, offset=offset) as client:
+ await self.get_session_button_data(user_id, client.player_id, force=True)
+ buttons = await self.gen_season_button(user_id, client.player_id)
+ if not buttons:
+ await message.reply_text("还没有幻想真境剧诗历史数据哦~")
+ return
+ await message.reply_text("请选择要查询的幻想真境剧诗历史数据", reply_markup=InlineKeyboardMarkup(buttons))
+
+ async def get_role_combat_history_page(self, update: "Update", user_id: int, uid: int, result: str):
+ """翻页处理"""
+ callback_query = update.callback_query
+
+ self.log_user(update, logger.info, "切换幻想真境剧诗历史数据页 page[%s]", result)
+ page = int(result.split("_")[1])
+ async with self.helper.genshin_or_public(user_id, uid=uid) as client:
+ buttons = await self.gen_season_button(user_id, client.player_id, page)
+ if not buttons:
+ await callback_query.answer("还没有幻想真境剧诗历史数据哦~", show_alert=True)
+ await callback_query.edit_message_text("还没有幻想真境剧诗历史数据哦~")
+ return
+ await callback_query.edit_message_reply_markup(reply_markup=InlineKeyboardMarkup(buttons))
+ await callback_query.answer(f"已切换到第 {page} 页", show_alert=False)
+
+ async def get_role_combat_history_season(self, update: "Update", data_id: int):
+ """进入选择幕数"""
+ callback_query = update.callback_query
+ user = callback_query.from_user
+
+ self.log_user(update, logger.info, "切换幻想真境剧诗历史数据到幕数页 data_id[%s]", data_id)
+ data = await self.history_data_abyss.get_by_id(data_id)
+ if not data:
+ await callback_query.answer("数据不存在,请尝试重新发送命令~", show_alert=True)
+ await callback_query.edit_message_text("数据不存在,请尝试重新发送命令~")
+ return
+ abyss_data = HistoryDataImgTheater.from_data(data)
+ buttons = await self.gen_floor_button(data_id, abyss_data, user.id, data.user_id)
+ await callback_query.edit_message_reply_markup(reply_markup=InlineKeyboardMarkup(buttons))
+ await callback_query.answer("已切换到幕数页", show_alert=False)
+
+ async def get_role_combat_history_floor(self, update: "Update", data_id: int, detail: str):
+ """渲染幕数数据"""
+ callback_query = update.callback_query
+ message = callback_query.message
+ reply = None
+ if message.reply_to_message:
+ reply = message.reply_to_message
+
+ floor = 0
+ total = False
+ if detail == "total":
+ floor = 0
+ elif detail == "all":
+ total = True
+ else:
+ floor = int(detail)
+ data = await self.history_data_abyss.get_by_id(data_id)
+ if not data:
+ await callback_query.answer("数据不存在,请尝试重新发送命令", show_alert=True)
+ await callback_query.edit_message_text("数据不存在,请尝试重新发送命令~")
+ return
+ abyss_data = HistoryDataImgTheater.from_data(data)
+
+ images = await self.get_rendered_pic(
+ abyss_data.abyss_data, abyss_data.character_data, data.user_id, floor, total
+ )
+ if images is None:
+ await callback_query.answer(f"还没有第 {floor} 幕的挑战数据", show_alert=True)
+ return
+ await callback_query.answer("正在渲染图片中 请稍等 请不要重复点击按钮", show_alert=False)
+
+ await message.reply_chat_action(ChatAction.UPLOAD_PHOTO)
+
+ for group in ArkoWrapper(images).group(10): # 每 10 张图片分一个组
+ await RenderGroupResult(results=group).reply_media_group(reply or message, write_timeout=60)
+ self.log_user(update, logger.info, "[bold]幻想真境剧诗挑战数据[/bold]: 成功发送图片", extra={"markup": True})
+ self.add_delete_message_job(message, delay=1)
+
+ @handler.callback_query(pattern=r"^get_role_combat_history\|", block=False)
+ async def get_role_combat_history(self, update: "Update", _: "ContextTypes.DEFAULT_TYPE") -> None:
+ callback_query = update.callback_query
+ user = callback_query.from_user
+
+ async def get_role_combat_history_callback(
+ callback_query_data: str,
+ ) -> Tuple[str, str, int, int]:
+ _data = callback_query_data.split("|")
+ _user_id = int(_data[1])
+ _uid = int(_data[2])
+ _result = _data[3]
+ _detail = _data[4] if len(_data) > 4 else None
+ logger.debug(
+ "callback_query_data函数返回 detail[%s] result[%s] user_id[%s] uid[%s]",
+ _detail,
+ _result,
+ _user_id,
+ _uid,
+ )
+ return _detail, _result, _user_id, _uid
+
+ detail, result, user_id, uid = await get_role_combat_history_callback(callback_query.data)
+ if user.id != user_id:
+ await callback_query.answer(text="这不是你的按钮!\n" + config.notice.user_mismatch, show_alert=True)
+ return
+ if result == "empty_data":
+ await callback_query.answer(text="此按钮不可用", show_alert=True)
+ return
+ if result.startswith("p_"):
+ await self.get_role_combat_history_page(update, user_id, uid, result)
+ return
+ data_id = int(result)
+ if detail:
+ await self.get_role_combat_history_floor(update, data_id, detail)
+ return
+ await self.get_role_combat_history_season(update, data_id)
+
+ async def abyss_use_by_inline(self, update: "Update", context: "ContextTypes.DEFAULT_TYPE", previous: bool):
+ callback_query = update.callback_query
+ user = update.effective_user
+ user_id = user.id
+ uid = IInlineUseData.get_uid_from_context(context)
+
+ self.log_user(update, logger.info, "查询幻想真境剧诗挑战总览数据 previous[%s]", previous)
+ notice = None
+ try:
+ async with self.helper.genshin_or_public(user_id, uid=uid) as client:
+ if not client.public:
+ await client.get_record_cards()
+ abyss_data, avatar_data = await self.get_rendered_pic_data(client, client.player_id, previous)
+ images = await self.get_rendered_pic(abyss_data, avatar_data, client.player_id, 0, False)
+ image = images[0]
+ except AbyssUnlocked: # 若幻想真境剧诗未解锁
+ notice = "还未解锁幻想真境剧诗哦~"
+ except NoMostKills: # 若幻想真境剧诗还未挑战
+ notice = "还没有挑战本次幻想真境剧诗呢,咕咕咕~"
+ except AbyssNotFoundError:
+ notice = "无法查询玩家挑战队伍详情,只能查询统计详情哦~"
+ except TooManyRequestPublicCookies:
+ notice = "查询次数太多,请您稍后重试"
+
+ if notice:
+ await callback_query.answer(notice, show_alert=True)
+ return
+
+ await image.edit_inline_media(callback_query)
+
+ async def get_inline_use_data(self) -> List[Optional[IInlineUseData]]:
+ return [
+ IInlineUseData(
+ text="本期幻想真境剧诗挑战总览",
+ hash="role_combat_current",
+ callback=partial(self.abyss_use_by_inline, previous=False),
+ player=True,
+ ),
+ IInlineUseData(
+ text="上期幻想真境剧诗挑战总览",
+ hash="role_combat_previous",
+ callback=partial(self.abyss_use_by_inline, previous=True),
+ player=True,
+ ),
+ ]
diff --git a/plugins/jobs/refresh_history.py b/plugins/jobs/refresh_history.py
index c51f011c..71df2253 100644
--- a/plugins/jobs/refresh_history.py
+++ b/plugins/jobs/refresh_history.py
@@ -1,6 +1,6 @@
import datetime
from asyncio import sleep
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, List, Dict
from simnet.errors import (
TimedOut as SimnetTimedOut,
@@ -11,13 +11,18 @@ from telegram.constants import ParseMode
from telegram.error import BadRequest, Forbidden
from core.plugin import Plugin, job
-from core.services.history_data.services import HistoryDataAbyssServices, HistoryDataLedgerServices
+from core.services.history_data.services import (
+ HistoryDataAbyssServices,
+ HistoryDataLedgerServices,
+ HistoryDataImgTheaterServices,
+)
from gram_core.basemodel import RegionEnum
from gram_core.plugin import handler
from gram_core.services.cookies import CookiesService
from gram_core.services.cookies.models import CookiesStatusEnum
from plugins.genshin.abyss import AbyssPlugin
from plugins.genshin.ledger import LedgerPlugin
+from plugins.genshin.role_combat import RoleCombatPlugin
from plugins.tools.genshin import GenshinHelper, PlayerNotFoundError, CookiesNotFoundError
from utils.log import logger
@@ -43,11 +48,13 @@ class RefreshHistoryJob(Plugin):
genshin_helper: GenshinHelper,
history_abyss: HistoryDataAbyssServices,
history_ledger: HistoryDataLedgerServices,
+ history_img_theater: HistoryDataImgTheaterServices,
):
self.cookies = cookies
self.genshin_helper = genshin_helper
self.history_data_abyss = history_abyss
self.history_data_ledger = history_ledger
+ self.history_data_img_theater = history_img_theater
@staticmethod
async def send_notice(context: "ContextTypes.DEFAULT_TYPE", user_id: int, notice_text: str):
@@ -58,11 +65,14 @@ class RefreshHistoryJob(Plugin):
except Exception as exc:
logger.error("执行自动刷新历史记录时发生错误 user_id[%s]", user_id, exc_info=exc)
- async def save_abyss_data(self, client: "GenshinClient") -> bool:
+ @staticmethod
+ async def get_genshin_characters(client: "GenshinClient"):
+ uid = client.player_id
+ return await client.get_genshin_characters(uid, lang="zh-cn")
+
+ async def save_abyss_data(self, client: "GenshinClient", avatar_data: Dict[int, int]) -> bool:
uid = client.player_id
abyss_data = await client.get_genshin_spiral_abyss(uid, previous=False, lang="zh-cn")
- avatars = await client.get_genshin_characters(uid, lang="zh-cn")
- avatar_data = {i.id: i.constellation for i in avatars}
if abyss_data.unlocked and abyss_data.ranks and abyss_data.ranks.most_kills:
return await AbyssPlugin.save_abyss_data(self.history_data_abyss, uid, abyss_data, avatar_data)
return False
@@ -101,6 +111,20 @@ class RefreshHistoryJob(Plugin):
notice_text = NOTICE_TEXT % ("旅行札记历史记录", now, uid, "旅行札记历史记录")
await self.send_notice(context, user_id, notice_text)
+ async def save_img_theater_data(self, client: "GenshinClient", avatar_data: Dict[int, int]) -> bool:
+ uid = client.player_id
+ abyss_data = await client.get_genshin_imaginarium_theater(uid, previous=False, lang="zh-cn")
+ if abyss_data.unlocked and abyss_data.data:
+ data = abyss_data.data[0]
+ if data.has_data and data.has_detail_data and data.detail:
+ return await RoleCombatPlugin.save_abyss_data(self.history_data_img_theater, uid, data, avatar_data)
+ return False
+
+ async def send_img_theater_notice(self, context: "ContextTypes.DEFAULT_TYPE", user_id: int, uid: int):
+ now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ notice_text = NOTICE_TEXT % ("幻想真境剧诗历史记录", now, uid, "挑战记录")
+ await self.send_notice(context, user_id, notice_text)
+
@handler.command(command="remove_same_history", block=False, admin=True)
async def remove_same_history(self, update: "Update", _: "ContextTypes.DEFAULT_TYPE"):
user = update.effective_user
@@ -112,6 +136,8 @@ class RefreshHistoryJob(Plugin):
text += f"深渊数据移除数量:{num1}\n"
num2 = await self.history_data_ledger.remove_same_data()
text += f"旅行札记数据移除数量:{num2}\n"
+ num3 = await self.history_data_img_theater.remove_same_data()
+ text += f"幻想真境剧诗数据移除数量:{num3}\n"
await reply.edit_text(text)
@handler.command(command="refresh_all_history", block=False, admin=True)
@@ -133,8 +159,12 @@ class RefreshHistoryJob(Plugin):
user_id = cookie_model.user_id
try:
async with self.genshin_helper.genshin(user_id) as client:
- if await self.save_abyss_data(client):
- await self.send_abyss_notice(context, user_id, client.player_id)
+ if avatars := await self.get_genshin_characters(client):
+ avatar_data = {i.id: i.constellation for i in avatars}
+ if await self.save_abyss_data(client, avatar_data):
+ await self.send_abyss_notice(context, user_id, client.player_id)
+ if await self.save_img_theater_data(client, avatar_data):
+ await self.send_img_theater_notice(context, user_id, client.player_id)
if await self.save_ledger_data(client):
await self.send_ledger_notice(context, user_id, client.player_id)
except (InvalidCookies, PlayerNotFoundError, CookiesNotFoundError):
diff --git a/requirements.txt b/requirements.txt
index 64c7f4d8..b5058465 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -91,7 +91,7 @@ rich==13.7.1
sentry-sdk==2.11.0
setuptools==71.1.0
shellingham==1.5.4
-simnet @ git+https://github.com/PaiGramTeam/SIMNet@d27e6e9e46e48e32ce70abb19a4030a1a93c940c
+simnet @ git+https://github.com/PaiGramTeam/SIMNet@0ddc9dabd1543450a7c3f513f177882ed04425fd
six==1.16.0
smmap==5.0.1
sniffio==1.3.1
diff --git a/resources/genshin/role_combat/background/abyss.png b/resources/genshin/role_combat/background/abyss.png
new file mode 100644
index 0000000000000000000000000000000000000000..362246ee8daa0b226da98a34043c386253f2e0f0
GIT binary patch
literal 22813
zcmV(_K-9m9P)