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

🎨 Update User-Agent

Browse Source
This commit is contained in:
洛水居室 2022-11-13 01:33:32 +08:00
parent 80577042da
commit 9c60087673
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/apihelper/hyperion.py
View File

@ -369,7 +369,7 @@ class Verification:
USER_AGENT = ( USER_AGENT = (
"User-Agent: Mozilla/5.0 (Linux; Android 12; Mi 10 Build/SKQ1.211006.001; wv) " "User-Agent: Mozilla/5.0 (Linux; Android 12; Mi 10 Build/SKQ1.211006.001; wv) "
"AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.129 Mobile Safari/537.36 " "AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.129 Mobile Safari/537.36 "
"miHoYoBBS/2.33.1" "miHoYoBBS/2.36.1"
) )
BBS_HEADERS = { BBS_HEADERS = {
"Accept": "application/json, text/plain, */*", "Accept": "application/json, text/plain, */*",

19
plugins/genshin/sign.py
View File

@ -69,8 +69,7 @@ class SignSystem:
} }
async def get_challenge_button( async def get_challenge_button(
self, uid: int, user_id: int, gt: Optional[str] = None, challenge: Optional[str] = None, self, uid: int, user_id: int, gt: Optional[str] = None, challenge: Optional[str] = None, callback: bool = True
callback: bool = True
) -> Optional[InlineKeyboardMarkup]: ) -> Optional[InlineKeyboardMarkup]:
if not config.pass_challenge_user_web: if not config.pass_challenge_user_web:
return None return None
@ -105,8 +104,8 @@ class SignSystem:
header = { header = {
"Accept": "*/*", "Accept": "*/*",
"X-Requested-With": "com.mihoyo.hyperion", "X-Requested-With": "com.mihoyo.hyperion",
"User-Agent": "Mozilla/5.0 (Linux; Android 12; Unspecified Device) AppleWebKit/537.36 (KHTML, like Gecko) " "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
"Version/4.0 Chrome/103.0.5060.129 Mobile Safari/537.36 miHoYoBBS/2.37.1", "Chrome/107.0.0.0 Safari/537.36",
"Referer": referer, "Referer": referer,
"Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7", "Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7",
} }
@ -129,7 +128,7 @@ class SignSystem:
timeout=30, timeout=30,
) )
text = req.text text = req.text
logger.debug(f"ajax 返回：{text}") logger.debug(f"ajax 返回：%s", text)
if req.status_code != 200: if req.status_code != 200:
raise RuntimeError raise RuntimeError
text = re.findall(r"^.*?\((\{.*?)\)$", text)[0] text = re.findall(r"^.*?\((\{.*?)\)$", text)[0]
@ -169,11 +168,11 @@ class SignSystem:
params=pass_challenge_params, params=pass_challenge_params,
timeout=60, timeout=60,
) )
logger.debug(f"签到 recognize 请求返回：{resp.text}") logger.debug(f"签到 recognize 请求返回：%s", resp.text)
data = resp.json() data = resp.json()
status = data.get("status") status = data.get("status")
if status is not None and status != 0: if status is not None and status != 0:
logger.error(f"签到 recognize 请求解析错误：{data.get('msg')}") logger.error(f"签到 recognize 请求解析错误：[%s]%s", data.get('code'), data.get('msg'))
if data.get("code", 0) != 0: if data.get("code", 0) != 0:
raise RuntimeError raise RuntimeError
logger.info("签到 recognize 请求 解析成功") logger.info("签到 recognize 请求 解析成功")
@ -389,11 +388,7 @@ class Sign(Plugin, BasePlugin):
await message.reply_text("未查询到您所绑定的账号信息，请先绑定账号", reply_markup=InlineKeyboardMarkup(buttons)) await message.reply_text("未查询到您所绑定的账号信息，请先绑定账号", reply_markup=InlineKeyboardMarkup(buttons))
except NeedChallenge as exc: except NeedChallenge as exc:
button = await self.system.get_challenge_button( button = await self.system.get_challenge_button(
exc.uid, exc.uid, user.id, exc.gt, exc.challenge, not filters.ChatType.PRIVATE.filter(message)
user.id,
exc.gt,
exc.challenge,
not filters.ChatType.PRIVATE.filter(message)
) )
reply_message = await message.reply_text( reply_message = await message.reply_text(
f"UID {exc.uid} 签到失败，触发验证码风控，请尝试点击下方按钮重新签到", allow_sending_without_reply=True, reply_markup=button f"UID {exc.uid} 签到失败，触发验证码风控，请尝试点击下方按钮重新签到", allow_sending_without_reply=True, reply_markup=button