PaiGramTeam/SIMNet
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/SIMNet.git synced 2024-09-28 03:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Add get the genshin accounts

Browse Source
This commit is contained in:
洛水居室 2023-05-11 17:35:24 +08:00 committed by GitHub
parent 859c21c4f5
commit a1b78dcb14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
simnet/client/components/lab.py
View File

@ -5,8 +5,8 @@ from simnet.client.base import BaseClient
from simnet.client.headers import Headers
from simnet.client.routes import TAKUMI_URL, HK4E_URL, CODE_URL
from simnet.models.lab.announcement import Announcement
from simnet.models.lab.record import PartialUser, FullUser
from simnet.utils.enum_ import Region
from simnet.models.lab.record import PartialUser, FullUser, Account
from simnet.utils.enum_ import Region, Game
from simnet.utils.lang import create_short_lang_code
from simnet.utils.player import recognize_genshin_server
from simnet.utils.types import HeaderTypes
@ -40,7 +40,7 @@ class LabClient(BaseClient):
headers (dict, optional): The headers to include in the request. Defaults to None.
Returns:
dict: The response data from the request.
Dict[str, Any]: The response data from the request.
"""
headers = Headers(headers)
@ -76,7 +76,7 @@ class LabClient(BaseClient):
lang (str, optional): The language code used for the request. Defaults to None.
Returns:
list of PartialUser: A list of partial user objects that match the search criteria.
List[PartialUser]: A list of partial user objects that match the search criteria.
"""
data = await self.request_bbs(
"community/search/wapi/search/user",
@ -142,7 +142,7 @@ class LabClient(BaseClient):
lang (str, optional): The language code used for the request. Defaults to None.
Returns:
list of Announcement: A list of announcement objects for the specified player.
List[Announcement]: A list of announcement objects for the specified player.
"""
player_id = self.player_id or player_id
if player_id is None:
@ -175,9 +175,7 @@ class LabClient(BaseClient):
announcements: List[Dict[str, Any]] = []
for sublist in info["list"]:
for info in sublist["list"]:
detail = next(
(i for i in details["list"] if i["ann_id"] == info["ann_id"]), None
)
detail = next((i for i in details["list"] if i["ann_id"] == info["ann_id"]), None)
announcements.append({**info, **(detail or {})})
return [Announcement(**i) for i in announcements]
@ -208,3 +206,24 @@ class LabClient(BaseClient):
lang=create_short_lang_code(lang or self.lang),
),
)
async def get_game_accounts(self, *, lang: Optional[str] = None) -> List[Account]:
"""Get the game accounts of the currently logged-in user.
Returns:
List[Account]: A list of account info objects.
"""
data = await self.request_bbs(
"binding/api/getUserGameRolesByCookie",
lang=lang,
)
return [Account(**i) for i in data["list"]]
async def get_genshin_accounts(self, *, lang: Optional[str] = None) -> List[Account]:
"""Get the genshin accounts of the currently logged-in user.
Returns:
List[Account]: A list of account info objects of genshin accounts.
"""
accounts = await self.get_game_accounts(lang=lang)
return [account for account in accounts if account.game == Game.GENSHIN]

9
tests/test_lab_client.py
View File

@ -4,7 +4,7 @@ import pytest
import pytest_asyncio
from simnet.client.components.lab import LabClient
from simnet.utils.enum_ import Region
from simnet.utils.enum_ import Region, Game
if TYPE_CHECKING:
from simnet.client.cookies import Cookies
@ -27,3 +27,10 @@ class TestStarRailClient:
user_info = await client_instance.get_user_info()
assert user_info.nickname
assert user_info.accident_id == account_id
@staticmethod
async def test_get_genshin_accounts(client_instance: "LabClient"):
genshin_accounts = await client_instance.get_genshin_accounts()
for genshin_account in genshin_accounts:
assert genshin_account.game == Game.GENSHIN
assert len(str(genshin_account.uid)) == 9