mirror of
https://github.com/PaiGramTeam/PaiGram.git
synced 2024-11-22 07:07:46 +00:00
🔥 Remove the image replacement of the Abyss plugin
This commit is contained in:
parent
5261c7534c
commit
286bc48837
@ -2,8 +2,8 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import re
|
import re
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from functools import lru_cache, partial
|
from functools import lru_cache
|
||||||
from typing import Any, Coroutine, List, Match, Optional, Tuple, Union
|
from typing import Any, Coroutine, List, Optional, Tuple, Union
|
||||||
|
|
||||||
from arkowrapper import ArkoWrapper
|
from arkowrapper import ArkoWrapper
|
||||||
from pytz import timezone
|
from pytz import timezone
|
||||||
@ -19,9 +19,7 @@ from core.plugin import Plugin, handler
|
|||||||
from core.services.cookies.error import TooManyRequestPublicCookies
|
from core.services.cookies.error import TooManyRequestPublicCookies
|
||||||
from core.services.template.models import RenderGroupResult, RenderResult
|
from core.services.template.models import RenderGroupResult, RenderResult
|
||||||
from core.services.template.services import TemplateService
|
from core.services.template.services import TemplateService
|
||||||
from metadata.genshin import game_id_to_role_id
|
|
||||||
from plugins.tools.genshin import PlayerNotFoundError, CookiesNotFoundError, GenshinHelper
|
from plugins.tools.genshin import PlayerNotFoundError, CookiesNotFoundError, GenshinHelper
|
||||||
from utils.helpers import async_re_sub
|
|
||||||
from utils.log import logger
|
from utils.log import logger
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@ -38,16 +36,6 @@ regex_01 = r"['\"]icon['\"]:\s*['\"](.*?)['\"]"
|
|||||||
regex_02 = r"['\"]side_icon['\"]:\s*['\"](.*?)['\"]"
|
regex_02 = r"['\"]side_icon['\"]:\s*['\"](.*?)['\"]"
|
||||||
|
|
||||||
|
|
||||||
async def replace_01(match: Match, assets_service: AssetsService) -> str:
|
|
||||||
aid = game_id_to_role_id(re.findall(r"UI_AvatarIcon_(.*?).png", match.group(1))[0])
|
|
||||||
return (await assets_service.avatar(aid).icon()).as_uri()
|
|
||||||
|
|
||||||
|
|
||||||
async def replace_02(match: Match, assets_service: AssetsService) -> str:
|
|
||||||
aid = game_id_to_role_id(re.findall(r"UI_AvatarIcon_Side_(.*?).png", match.group(1))[0])
|
|
||||||
return (await assets_service.avatar(aid).side()).as_uri()
|
|
||||||
|
|
||||||
|
|
||||||
@lru_cache
|
@lru_cache
|
||||||
def get_args(text: str) -> Tuple[int, bool, bool]:
|
def get_args(text: str) -> Tuple[int, bool, bool]:
|
||||||
if text.startswith("/"):
|
if text.startswith("/"):
|
||||||
@ -159,9 +147,6 @@ class AbyssPlugin(Plugin):
|
|||||||
except AbyssNotFoundError:
|
except AbyssNotFoundError:
|
||||||
await message.reply_text("无法查询玩家挑战队伍详情,只能查询统计详情哦~")
|
await message.reply_text("无法查询玩家挑战队伍详情,只能查询统计详情哦~")
|
||||||
return
|
return
|
||||||
except IndexError: # 若深渊为挑战此层
|
|
||||||
await message.reply_text("还没有挑战本层呢,咕咕咕~")
|
|
||||||
return
|
|
||||||
except PlayerNotFoundError: # 若未找到账号
|
except PlayerNotFoundError: # 若未找到账号
|
||||||
buttons = [[InlineKeyboardButton("点我绑定账号", url=create_deep_linked_url(context.bot.username, "set_uid"))]]
|
buttons = [[InlineKeyboardButton("点我绑定账号", url=create_deep_linked_url(context.bot.username, "set_uid"))]]
|
||||||
if filters.ChatType.GROUPS.filter(message):
|
if filters.ChatType.GROUPS.filter(message):
|
||||||
@ -243,10 +228,7 @@ class AbyssPlugin(Plugin):
|
|||||||
total_stars = f"{sum(stars)} ({'-'.join(map(str, stars))})"
|
total_stars = f"{sum(stars)} ({'-'.join(map(str, stars))})"
|
||||||
|
|
||||||
render_data = {}
|
render_data = {}
|
||||||
result = await async_re_sub(
|
result = abyss_data.json(encoder=json_encoder)
|
||||||
regex_01, partial(replace_01, assets_service=self.assets_service), abyss_data.json(encoder=json_encoder)
|
|
||||||
)
|
|
||||||
result = await async_re_sub(regex_02, partial(replace_02, assets_service=self.assets_service), result)
|
|
||||||
|
|
||||||
render_data["time"] = time
|
render_data["time"] = time
|
||||||
render_data["stars"] = total_stars
|
render_data["stars"] = total_stars
|
||||||
|
Loading…
Reference in New Issue
Block a user