Leahnaya/s3s
1
0
Fork 0
mirror of https://github.com/frozenpandaman/s3s.git synced 2026-09-10 11:35:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring to fix #159 error & re-bump to v0.6.0

Browse Source
This commit is contained in:
eli
2023-12-10 19:31:49 -10:00
committed by GitHub
parent e54c4b601a
commit c110e2e559
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iksm.py
View File

@@ -16,6 +16,7 @@ NSOAPP_VER_FALLBACK = "2.8.1"
WEB_VIEW_VERSION = "unknown"
WEB_VIEW_VER_FALLBACK = "6.0.0-e135295b" # fallback for current splatnet 3 ver
SPLATNET3_URL = "https://api.lp1.av5ja.srv.nintendo.net"
GRAPHQL_URL = SPLATNET3_URL + "/api/graphql"
# functions in this file & call stack:
# - get_nsoapp_version()

26
s3s.py
View File

@@ -123,7 +123,7 @@ def prefetch_checks(printout=False):
gen_new_tokens("blank")
sha = utils.translate_rid["HomeQuery"]
test = requests.post(utils.GRAPHQL_URL, data=utils.gen_graphql_body(sha), headers=headbutt(), cookies=dict(_gtoken=GTOKEN))
test = requests.post(iksm.GRAPHQL_URL, data=utils.gen_graphql_body(sha), headers=headbutt(), cookies=dict(_gtoken=GTOKEN))
if test.status_code != 200:
if printout:
print("\n")
@@ -248,7 +248,7 @@ def fetch_json(which, separate=False, exportall=False, specific=False, numbers_o
sha = utils.translate_rid[sha]
battle_ids, job_ids = [], []
query1 = requests.post(utils.GRAPHQL_URL,
query1 = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(sha),
headers=headbutt(forcelang=lang),
cookies=dict(_gtoken=GTOKEN))
@@ -343,7 +343,7 @@ def fetch_detailed_result(is_vs_history, history_id, swim):
varname = "vsResultId" if is_vs_history else "coopHistoryDetailId"
lang = None if is_vs_history else 'en-US'
query2 = requests.post(utils.GRAPHQL_URL,
query2 = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid[sha], varname, history_id),
headers=headbutt(forcelang=lang),
cookies=dict(_gtoken=GTOKEN))
@@ -669,7 +669,7 @@ def prepare_battle_result(battle, ismonitoring, isblackout, overview_data=None):
battle_id_mutated = battle_id.replace("BANKARA", "RECENT") # normalize the ID, make work with -M and -r
if overview_data is None: # no passed in file with -i
overview_post = requests.post(utils.GRAPHQL_URL,
overview_post = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid["BankaraBattleHistoriesQuery"]),
headers=headbutt(),
cookies=dict(_gtoken=GTOKEN))
@@ -756,7 +756,7 @@ def prepare_battle_result(battle, ismonitoring, isblackout, overview_data=None):
battle_id_mutated = battle_id.replace("XMATCH", "RECENT")
if overview_data is None: # no passed in file with -i
overview_post = requests.post(utils.GRAPHQL_URL,
overview_post = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid["XBattleHistoriesQuery"]),
headers=headbutt(),
cookies=dict(_gtoken=GTOKEN))
@@ -905,7 +905,7 @@ def prepare_job_result(job, ismonitoring, isblackout, overview_data=None, prevre
except KeyError: # prev job was private or disconnect
pass
else:
prev_job_post = requests.post(utils.GRAPHQL_URL,
prev_job_post = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid["CoopHistoryDetailQuery"], "coopHistoryDetailId", prev_job_id),
headers=headbutt(forcelang='en-US'),
cookies=dict(_gtoken=GTOKEN))
@@ -1379,7 +1379,7 @@ def fetch_and_upload_single_result(hash, noun, isblackout, istestrun):
dict_key2 = "coopHistoryDetailId"
lang = 'en-US'
result_post = requests.post(utils.GRAPHQL_URL,
result_post = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid[dict_key], dict_key2, hash),
headers=headbutt(forcelang=lang),
cookies=dict(_gtoken=GTOKEN))
@@ -1387,7 +1387,7 @@ def fetch_and_upload_single_result(hash, noun, isblackout, istestrun):
result = json.loads(result_post.text)
post_result(result, False, isblackout, istestrun) # not monitoring mode
except json.decoder.JSONDecodeError: # retry once, hopefully avoid a few errors
result_post = requests.post(utils.GRAPHQL_URL,
result_post = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid[dict_key], dict_key2, hash),
headers=headbutt(forcelang=lang),
cookies=dict(_gtoken=GTOKEN))
@@ -1493,7 +1493,7 @@ def check_for_new_results(which, cached_battles, cached_jobs, battle_wins, battl
for num in reversed(ink_results):
if num not in cached_battles:
# get the full battle data
result_post = requests.post(utils.GRAPHQL_URL,
result_post = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid["VsHistoryDetailQuery"], "vsResultId", num),
headers=headbutt(),
cookies=dict(_gtoken=GTOKEN))
@@ -1549,7 +1549,7 @@ def check_for_new_results(which, cached_battles, cached_jobs, battle_wins, battl
for num in reversed(salmon_results):
if num not in cached_jobs:
# get the full job data
result_post = requests.post(utils.GRAPHQL_URL,
result_post = requests.post(iksm.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid["CoopHistoryDetailQuery"], "coopHistoryDetailId", num),
headers=headbutt(forcelang='en-US'),
cookies=dict(_gtoken=GTOKEN))
@@ -1700,11 +1700,11 @@ def export_seed_json(skipprefetch=False):
prefetch_checks(printout=True)
sha = utils.translate_rid["MyOutfitCommonDataEquipmentsQuery"]
outfit_post = requests.post(utils.GRAPHQL_URL, data=utils.gen_graphql_body(sha),
outfit_post = requests.post(iksm.GRAPHQL_URL, data=utils.gen_graphql_body(sha),
headers=headbutt(), cookies=dict(_gtoken=GTOKEN))
sha = utils.translate_rid["LatestBattleHistoriesQuery"]
history_post = requests.post(utils.GRAPHQL_URL, data=utils.gen_graphql_body(sha),
history_post = requests.post(iksm.GRAPHQL_URL, data=utils.gen_graphql_body(sha),
headers=headbutt(), cookies=dict(_gtoken=GTOKEN))
if outfit_post.status_code != 200 or history_post.status_code != 200:
@@ -1725,7 +1725,7 @@ def export_seed_json(skipprefetch=False):
except KeyError: # no recent battles (mr. grizz is pleased)
try:
sha = utils.translate_rid["CoopHistoryQuery"]
history_post = requests.post(utils.GRAPHQL_URL, data=utils.gen_graphql_body(sha),
history_post = requests.post(iksm.GRAPHQL_URL, data=utils.gen_graphql_body(sha),
headers=headbutt(), cookies=dict(_gtoken=GTOKEN))
if history_post.status_code != 200:

3
utils.py
View File

@@ -5,10 +5,7 @@
import base64, datetime, json, re, sys, uuid
import requests
from bs4 import BeautifulSoup
import iksm
SPLATNET3_URL = iksm.SPLATNET3_URL
GRAPHQL_URL = f'{SPLATNET3_URL}/api/graphql'
S3S_NAMESPACE = uuid.UUID('b3a2dbf5-2c09-4792-b78c-00b548b70aeb')
SALMON_NAMESPACE = uuid.UUID('f1911910-605e-11ed-a622-7085c2057a9d')