PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-22 07:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix weapon plugin not handling notice correctly in AssetsCouldNotFound exception

Browse Source
This commit is contained in:
洛水居室 2022-11-19 16:08:35 +08:00
parent a10ff3728b
commit 304eb5e740
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/base/assets.py
View File

@ -45,7 +45,10 @@ class AssetsServiceError(Exception):
class AssetsCouldNotFound(AssetsServiceError):
pass
def __init__(self, message: str, target: str):
self.message = message
self.target = target
super().__init__(f"{message}: target={message}")
class _AssetsService(ABC):
@ -223,7 +226,7 @@ class _AvatarAssets(_AssetsService):
except ValueError:
target = roleToId(target)
if isinstance(target, str) or target is None:
raise AssetsCouldNotFound(f"找不到对应的角色: target={temp}")
raise AssetsCouldNotFound("找不到对应的角色", temp)
result.id = target
result._enka_api = self._enka_api
return result
@ -288,7 +291,7 @@ class _WeaponAssets(_AssetsService):
if isinstance(target, str):
target = int(target) if target.isnumeric() else weaponToId(target)
if isinstance(target, str) or target is None:
raise AssetsCouldNotFound(f"找不到对应的武器: target={temp}")
raise AssetsCouldNotFound("找不到对应的武器", temp)
result.id = target
return result
@ -329,7 +332,7 @@ class _MaterialAssets(_AssetsService):
else:
target = {v["name"]: int(k) for k, v in MATERIAL_DATA.items()}.get(target)
if isinstance(target, str) or target is None:
raise AssetsCouldNotFound(f"找不到对应的素材: target={temp}")
raise AssetsCouldNotFound("找不到对应的素材", temp)
result.id = target
return result

2
plugins/genshin/daily/material.py
View File

@ -312,7 +312,7 @@ class DailyMaterial(Plugin, BasePlugin):
material = HONEY_DATA["material"][mid]
materials.append(ItemData(id=mid, icon=path, name=material[1], rarity=material[2]))
except AssetsCouldNotFound as exc:
logger.error(f"出错了呜呜呜 ~ {repr(exc)}")
logger.warning("%s mid[%s]", exc.message, exc.target)
await notice.edit_text("出错了呜呜呜 ~ 派蒙找不到一些素材")
return
areas.append(

12
plugins/genshin/weapon.py
View File

@ -2,7 +2,7 @@ from telegram import InlineKeyboardButton, InlineKeyboardMarkup, Update
from telegram.constants import ChatAction
from telegram.ext import CallbackContext, CommandHandler, MessageHandler, filters
from core.base.assets import AssetsService
from core.base.assets import AssetsService, AssetsCouldNotFound
from core.baseplugin import BasePlugin
from core.plugin import Plugin, handler
from core.template import TemplateService
@ -109,7 +109,15 @@ class WeaponPlugin(Plugin, BasePlugin):
}
return _template_data
template_data = await input_template_data(weapon_data)
try:
template_data = await input_template_data(weapon_data)
except AssetsCouldNotFound as exc:
logger.warning("%s weapon_name[%s]", exc.message, weapon_name)
reply_message = await message.reply_text(f"数据库中没有找到 {weapon_name}")
if filters.ChatType.GROUPS.filter(reply_message):
self._add_delete_message_job(context, message.chat_id, message.message_id)
self._add_delete_message_job(context, reply_message.chat_id, reply_message.message_id)
return
png_data = await self.template_service.render(
"genshin/weapon/weapon.html", template_data, {"width": 540, "height": 540}, ttl=31 * 24 * 60 * 60
)