PaiGramTeam/SIMNet
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/SIMNet.git synced 2024-11-25 15:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

⏪ Revert "Update DailyRewardClient error handler"

Browse Source
This commit is contained in:
洛水居室 2023-07-19 13:27:55 +08:00
parent 409e0058f9
commit abd73f4050
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
simnet/client/components/daily.py
View File

@ -81,7 +81,7 @@ class DailyRewardClient(BaseClient):
url = base_url / endpoint url = base_url / endpoint
daily_reward = await self.request_lab( return await self.request_lab(
url, url,
method, method,
params=params, params=params,
@ -89,20 +89,6 @@ class DailyRewardClient(BaseClient):
lang=lang, lang=lang,
) )
if endpoint == "sign":
if self.region == Region.CHINESE and daily_reward.get("success", 0) == 1:
gt = daily_reward.get("gt", "")
challenge = daily_reward.get("challenge", "")
raise GeetestTriggered(gt, challenge)
if self.region == Region.OVERSEAS:
gt_result = daily_reward.get("gt_result")
if gt_result is not None and gt_result["success"] != 0:
gt = gt_result.get("gt", "")
challenge = gt_result.get("challenge", "")
raise GeetestTriggered(gt, challenge)
return daily_reward
async def get_reward_info( async def get_reward_info(
self, self,
*, *,
@ -232,7 +218,7 @@ class DailyRewardClient(BaseClient):
Returns: Returns:
If `reward` is True, a DailyReward object representing the claimed reward. Otherwise, None. If `reward` is True, a DailyReward object representing the claimed reward. Otherwise, None.
""" """
await self.request_daily_reward( daily_reward = await self.request_daily_reward(
"sign", "sign",
method="POST", method="POST",
game=game or self.game, game=game or self.game,
@ -241,6 +227,17 @@ class DailyRewardClient(BaseClient):
validate=validate, validate=validate,
) )
if self.region == Region.CHINESE and daily_reward.get("success", 0) == 1:
gt = daily_reward.get("gt", "")
challenge = daily_reward.get("challenge", "")
raise GeetestTriggered(gt, challenge)
if self.region == Region.OVERSEAS:
gt_result = daily_reward.get("gt_result")
if gt_result is not None and gt_result["success"] != 0:
gt = gt_result.get("gt", "")
challenge = gt_result.get("challenge", "")
raise GeetestTriggered(gt, challenge)
if not reward: if not reward:
return None return None