diff --git a/pdm.lock b/pdm.lock index 8557d4c..c1c979c 100644 --- a/pdm.lock +++ b/pdm.lock @@ -2150,7 +2150,7 @@ files = [ [[package]] name = "sentry-sdk" -version = "2.5.1" +version = "2.6.0" requires_python = ">=3.6" summary = "Python client for Sentry (https://sentry.io)" groups = ["default"] @@ -2159,8 +2159,8 @@ dependencies = [ "urllib3>=1.26.11", ] files = [ - {file = "sentry_sdk-2.5.1-py2.py3-none-any.whl", hash = "sha256:1f87acdce4a43a523ae5aa21a3fc37522d73ebd9ec04b1dbf01aa3d173852def"}, - {file = "sentry_sdk-2.5.1.tar.gz", hash = "sha256:fbc40a78a8a9c6675133031116144f0d0940376fa6e4e1acd5624c90b0aaf58b"}, + {file = "sentry_sdk-2.6.0-py2.py3-none-any.whl", hash = "sha256:422b91cb49378b97e7e8d0e8d5a1069df23689d45262b86f54988a7db264e874"}, + {file = "sentry_sdk-2.6.0.tar.gz", hash = "sha256:65cc07e9c6995c5e316109f138570b32da3bd7ff8d0d0ee4aaf2628c3dd8127d"}, ] [[package]] @@ -2190,7 +2190,7 @@ name = "simnet" version = "0.1.22" requires_python = "<4.0,>=3.8" git = "https://github.com/PaiGramTeam/SIMNet" -revision = "13a0d8a4f626c22484b3650eef5c177fa2939ac8" +revision = "6c2c41239e0bfa177dee1ab91d63e04382cb29ab" summary = "Modern API wrapper for Genshin Impact & Honkai: Star Rail built on asyncio and pydantic." groups = ["default"] dependencies = [ diff --git a/plugins/starrail/daily_note.py b/plugins/starrail/daily_note.py index 9245182..ce3ed83 100644 --- a/plugins/starrail/daily_note.py +++ b/plugins/starrail/daily_note.py @@ -74,12 +74,16 @@ class DailyNotePlugin(Plugin): "max_weekly_discounts": daily_info.max_weekly_discounts, "current_rogue_score": daily_info.current_rogue_score, "max_rogue_score": daily_info.max_rogue_score, + "rogue_tourn_weekly_unlocked": daily_info.rogue_tourn_weekly_unlocked, + "rogue_tourn_weekly_max": daily_info.rogue_tourn_weekly_max, + "rogue_tourn_weekly_cur": daily_info.rogue_tourn_weekly_cur, } render_result = await self.template_service.render( "starrail/daily_note/daily_note.html", render_data, - {"width": 600, "height": 530}, + {"width": 600, "height": 1000}, full_page=False, + query_selector=".container", ttl=8 * 60, ) return render_result @@ -87,7 +91,12 @@ class DailyNotePlugin(Plugin): @staticmethod def get_task_button(bot_username: str) -> InlineKeyboardMarkup: return InlineKeyboardMarkup( - [[InlineKeyboardButton(">> 设置状态提醒 <<", url=create_deep_linked_url(bot_username, "daily_note_tasks"))]] + [ + [ + InlineKeyboardButton("设置状态提醒", url=create_deep_linked_url(bot_username, "daily_note_tasks")), + InlineKeyboardButton("在其他对话使用", switch_inline_query="功能"), + ] + ] ) @handler.command("dailynote", cookie=True, block=False) diff --git a/pyproject.toml b/pyproject.toml index d7604e0..ec9df90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "arko-wrapper<1.0.0,>=0.2.8", "fastapi<1.0.0,>=0.111.0", "uvicorn[standard]<1.0.0,>=0.30.1", - "sentry-sdk<3.0.0,>=2.5.1", + "sentry-sdk<3.0.0,>=2.6.0", "GitPython<4.0.0,>=3.1.30", "openpyxl<4.0.0,>=3.1.1", "async-lru<3.0.0,>=2.0.4", diff --git a/requirements.txt b/requirements.txt index a5fe712..22e2cc7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -84,10 +84,10 @@ rapidfuzz==3.9.3 reactivex==4.0.4 redis==5.0.6 rich==13.7.1 -sentry-sdk==2.5.1 +sentry-sdk==2.6.0 setuptools==70.0.0 shellingham==1.5.4 -simnet @ git+https://github.com/PaiGramTeam/SIMNet@0b8ef8e8e35d13b15c13dfaf6ddf28a83c2b72a7 +simnet @ git+https://github.com/PaiGramTeam/SIMNet@6c2c41239e0bfa177dee1ab91d63e04382cb29ab six==1.16.0 smmap==5.0.1 sniffio==1.3.1 diff --git a/resources/starrail/daily_note/daily_note.html b/resources/starrail/daily_note/daily_note.html index 364f9cf..1b4e694 100644 --- a/resources/starrail/daily_note/daily_note.html +++ b/resources/starrail/daily_note/daily_note.html @@ -131,6 +131,26 @@ >{{ remaining_weekly_discounts }}/{{ max_weekly_discounts }} + {% if rogue_tourn_weekly_unlocked %} +