PaiGramTeam/PamGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PamGram.git synced 2024-11-16 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 解决部分查询时UID错误的问题

Browse Source
This commit is contained in:
洛水居室 2022-10-08 21:35:46 +08:00
parent dc30f33dd1
commit 52de48fedf
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/genshin/userstats.py
View File

@ -1,7 +1,7 @@
import secrets import secrets
from typing import Optional from typing import Optional
from genshin import GenshinException, Client from genshin import Client
from genshin.models import GenshinUserStats from genshin.models import GenshinUserStats
from telegram import Update from telegram import Update
from telegram.constants import ChatAction from telegram.constants import ChatAction
@ -42,23 +42,20 @@ class UserStatsPlugins(Plugin, BasePlugin):
user = update.effective_user user = update.effective_user
message = update.effective_message message = update.effective_message
logger.info(f"用户 {user.full_name}[{user.id}] 查询游戏用户命令请求") logger.info(f"用户 {user.full_name}[{user.id}] 查询游戏用户命令请求")
uid: int = -1 uid: Optional[int] = None
try: try:
args = context.args args = context.args
if args is not None and len(args) >= 1: if args is not None and len(args) >= 1:
uid = int(args[0]) uid = int(args[0])
except ValueError as exc: except ValueError as exc:
logger.error("获取 uid 发生错误！ 错误信息为") logger.warning(f"获取 uid 发生错误！ 错误信息为 {repr(exc)}")
logger.exception(exc)
await message.reply_text("输入错误") await message.reply_text("输入错误")
return ConversationHandler.END return ConversationHandler.END
try: try:
try: try:
client = await get_genshin_client(user.id) client = await get_genshin_client(user.id)
except CookiesNotFoundError: except CookiesNotFoundError:
client, _uid = await get_public_genshin_client(user.id) client, uid = await get_public_genshin_client(user.id)
if uid == -1:
uid = _uid
png_data = await self.render(client, uid) png_data = await self.render(client, uid)
except UserNotFoundError: except UserNotFoundError:
reply_message = await message.reply_text("未查询到账号信息，请先私聊派蒙绑定账号") reply_message = await message.reply_text("未查询到账号信息，请先私聊派蒙绑定账号")
@ -84,15 +81,12 @@ class UserStatsPlugins(Plugin, BasePlugin):
png_data, filename=f"{client.uid}.png", allow_sending_without_reply=True png_data, filename=f"{client.uid}.png", allow_sending_without_reply=True
) )
async def render(self, client: Client, uid: int = -1) -> bytes: async def render(self, client: Client, uid: Optional[int] = None) -> bytes:
if uid == -1 and client.uid: if uid is None:
uid = client.uid uid = client.uid
try: user_info = await client.get_genshin_user(uid)
user_info = await client.get_genshin_user(uid) logger.debug(user_info)
logger.debug(user_info)
except GenshinException as exc:
raise exc
# 因为需要替换线上图片地址为本地地址，先克隆数据，避免修改原数据 # 因为需要替换线上图片地址为本地地址，先克隆数据，避免修改原数据
user_info = user_info.copy(deep=True) user_info = user_info.copy(deep=True)