PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-16 04:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Implement UIGF v2.4

Browse Source
This commit is contained in:
omg-xtao 2024-01-16 19:33:14 +08:00 committed by GitHub
parent 1d42b362ee
commit d520a0980a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gacha_log/const.py
View File

@ -1,7 +1,7 @@
from simnet.models.genshin.wish import BannerType
PAIMONMOE_VERSION = 3
UIGF_VERSION = "v2.3"
UIGF_VERSION = "v2.4"
GACHA_TYPE_LIST = {

10
modules/gacha_log/models.py
View File

@ -162,13 +162,23 @@ class UIGFInfo(BaseModel):
export_app: str = ""
export_app_version: str = ""
uigf_version: str = UIGF_VERSION
region_time_zone: int = 8
def __init__(self, **data: Any):
data["region_time_zone"] = data.get("region_time_zone", UIGFInfo.get_region_time_zone(data.get("uid", "0")))
super().__init__(**data)
if not self.export_time:
self.export_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
self.export_timestamp = int(datetime.datetime.now().timestamp())
@staticmethod
def get_region_time_zone(uid: str) -> int:
if uid.startswith("6"):
return -5
if uid.startswith("7"):
return 1
return 8
class UIGFModel(BaseModel):
info: UIGFInfo

11
plugins/genshin/wish_log.py
View File

@ -18,6 +18,7 @@ from core.services.players import PlayersService
from core.services.template.models import FileType
from core.services.template.services import TemplateService
from metadata.scripts.paimon_moe import GACHA_LOG_PAIMON_MOE_PATH, update_paimon_moe_zh
from modules.gacha_log.const import UIGF_VERSION
from modules.gacha_log.error import (
GachaLogAccountNotFound,
GachaLogAuthkeyTimeout,
@ -55,7 +56,7 @@ class WishLogPlugin(Plugin.Conversation):
IMPORT_HINT = (
"<b>开始导入祈愿历史记录：请通过 https://paimon.moe/wish/import 获取抽卡记录链接后发送给我"
"（非 paimon.moe 导出的文件数据）</b>\n\n"
"> 你还可以向派蒙发送从其他工具导出的 UIGF 标准的记录文件\n"
f"> 你还可以向派蒙发送从其他工具导出的 UIGF {UIGF_VERSION} 标准的记录文件\n"
"> 或者从 paimon.moe 、非小酋 导出的 xlsx 记录文件\n"
"> 在绑定 Cookie 时添加 stoken 可能有特殊效果哦（仅限国服）\n"
"<b>注意：导入的数据将会与旧数据进行合并。</b>"
@ -155,14 +156,14 @@ class WishLogPlugin(Plugin.Conversation):
)
return
except GachaLogFileError:
await message.reply_text("文件解析失败，请检查文件是否符合 UIGF 标准")
await message.reply_text(f"文件解析失败，请检查文件是否符合 UIGF {UIGF_VERSION} 标准")
return
except (KeyError, IndexError, ValueError):
await message.reply_text("文件解析失败，请检查文件编码是否正确或符合 UIGF 标准")
await message.reply_text(f"文件解析失败，请检查文件编码是否正确或符合 UIGF {UIGF_VERSION} 标准")
return
except Exception as exc:
logger.error("文件解析失败 %s", repr(exc))
await message.reply_text("文件解析失败，请检查文件是否符合 UIGF 标准")
await message.reply_text(f"文件解析失败，请检查文件是否符合 UIGF {UIGF_VERSION} 标准")
return
await message.reply_chat_action(ChatAction.TYPING)
reply = await message.reply_text("文件解析成功，正在导入数据")
@ -171,7 +172,7 @@ class WishLogPlugin(Plugin.Conversation):
text = await self._refresh_user_data(user, data=data, verify_uid=file_type == "json")
except Exception as exc: # pylint: disable=W0703
logger.error("文件解析失败 %s", repr(exc))
text = "文件解析失败，请检查文件是否符合 UIGF 标准"
text = f"文件解析失败，请检查文件是否符合 UIGF {UIGF_VERSION} 标准"
await reply.edit_text(text)
async def can_gen_authkey(self, uid: int) -> bool: