xuthus/LittlePaimon
1
0
Fork 0
mirror of https://github.com/xuthus83/LittlePaimon.git synced 2024-10-21 16:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Bot' of https://github.com/CMHopeSunshine/LittlePaimon into Bot

Browse Source
This commit is contained in:
CMHopeSunshine 2023-12-02 23:18:28 +08:00
commit 503723e549
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LittlePaimon/plugins/bot_manager/__init__.py
View File

@ -166,7 +166,7 @@ async def _(event: MessageEvent, cmd: str = ArgPlainText('cmd')):
try: try:
result = (stdout or stderr).decode('utf-8') result = (stdout or stderr).decode('utf-8')
except Exception: except Exception:
result = str(stdout or stderr) result = (stdout or stderr).decode('gbk')
await run_cmd.finish(f'{cmd}\n运行结果：\n{result}') await run_cmd.finish(f'{cmd}\n运行结果：\n{result}')

36
LittlePaimon/utils/api.py
View File

@ -35,9 +35,9 @@ DAILY_NOTE_API = (
GAME_RECORD_API = ( GAME_RECORD_API = (
'https://api-takumi-record.mihoyo.com/game_record/card/wapi/getGameRecordCard' 'https://api-takumi-record.mihoyo.com/game_record/card/wapi/getGameRecordCard'
) )
SIGN_INFO_API = 'https://api-takumi.mihoyo.com/event/bbs_sign_reward/info' SIGN_INFO_API = 'https://api-takumi.mihoyo.com/event/luna/info'
SIGN_REWARD_API = 'https://api-takumi.mihoyo.com/event/bbs_sign_reward/home' SIGN_REWARD_API = 'https://api-takumi.mihoyo.com/event/luna/home'
SIGN_ACTION_API = 'https://api-takumi.mihoyo.com/event/bbs_sign_reward/sign' SIGN_ACTION_API = 'https://api-takumi.mihoyo.com/event/luna/sign'
AUTHKEY_API = 'https://api-takumi.mihoyo.com/binding/api/genAuthKey' AUTHKEY_API = 'https://api-takumi.mihoyo.com/binding/api/genAuthKey'
STOKEN_API = 'https://api-takumi.mihoyo.com/auth/api/getMultiTokenByLoginTicket' STOKEN_API = 'https://api-takumi.mihoyo.com/auth/api/getMultiTokenByLoginTicket'
COOKIE_TOKEN_API = 'https://api-takumi.mihoyo.com/auth/api/getCookieAccountInfoBySToken' COOKIE_TOKEN_API = 'https://api-takumi.mihoyo.com/auth/api/getCookieAccountInfoBySToken'
@ -147,12 +147,12 @@ def mihoyo_sign_headers(cookie: str, extra_headers: Optional[dict] = None) -> di
'Version/4.0 Chrome/103.0.5060.129 Mobile Safari/537.36 miHoYoBBS/2.35.2', 'Version/4.0 Chrome/103.0.5060.129 Mobile Safari/537.36 miHoYoBBS/2.35.2',
'Cookie': cookie, 'Cookie': cookie,
'x-rpc-device_id': random_hex(32), 'x-rpc-device_id': random_hex(32),
'Origin': 'https://webstatic.mihoyo.com', 'Origin': 'https://act.mihoyo.com',
'X_Requested_With': 'com.mihoyo.hyperion', 'X_Requested_With': 'com.mihoyo.hyperion',
'DS': get_old_version_ds(mhy_bbs=True), 'DS': get_old_version_ds(mhy_bbs=True),
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer': 'https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?bbs_auth_required=true&act_id' 'Referer': 'https://act.mihoyo.com',
'=e202009291139501&utm_source=bbs&utm_medium=mys&utm_campaign=icon', "x-rpc-signgame":"hk4e",
'x-rpc-app_version': '2.35.2', 'x-rpc-app_version': '2.35.2',
} }
if extra_headers: if extra_headers:
@ -362,21 +362,22 @@ async def get_mihoyo_private_data(
data = await aiorequests.get( data = await aiorequests.get(
url=SIGN_INFO_API, url=SIGN_INFO_API,
headers={ headers={
'x-rpc-app_version': '2.11.1', #'x-rpc-app_version': '2.11.1',
'x-rpc-client_type': '5', #'x-rpc-client_type': '5',
'Origin': 'https://webstatic.mihoyo.com', 'Origin': 'https://act.mihoyo.com',
'Referer': 'https://webstatic.mihoyo.com/', 'Referer': 'https://act.mihoyo.com/',
'Cookie': cookie_info.cookie, 'Cookie': cookie_info.cookie,
"x-rpc-signgame":"hk4e",
'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS ' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS '
'X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1', 'X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.57.1',
}, },
params={'act_id': 'e202009291139501', 'region': server_id, 'uid': uid}, params={'act_id': 'e202311201442471', 'region': server_id, 'uid': uid},
) )
elif mode == 'sign_action': elif mode == 'sign_action':
data = await aiorequests.post( data = await aiorequests.post(
url=SIGN_ACTION_API, url=SIGN_ACTION_API,
headers=mihoyo_sign_headers(cookie_info.cookie), headers=mihoyo_sign_headers(cookie_info.cookie),
json={'act_id': 'e202009291139501', 'uid': uid, 'region': server_id}, json={'act_id': 'e202311201442471', 'uid': uid, 'region': server_id},
) )
else: else:
data = None data = None
@ -392,12 +393,13 @@ async def get_sign_reward_list() -> dict:
headers = { headers = {
'x-rpc-app_version': '2.11.1', 'x-rpc-app_version': '2.11.1',
'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.57.1',
'x-rpc-client_type': '5', #'x-rpc-client_type': '5',
'Referer': 'https://webstatic.mihoyo.com/', "x-rpc-signgame":"hk4e",
'Referer': 'https://act.mihoyo.com/',
} }
resp = await aiorequests.get( resp = await aiorequests.get(
url=SIGN_REWARD_API, headers=headers, params={'act_id': 'e202009291139501'} url=SIGN_REWARD_API, headers=headers, params={'act_id': 'e202311201442471'}
) )
data = resp.json() data = resp.json()
nb_logger.debug(data) nb_logger.debug(data)