Leahnaya/s3s
1
0
Fork 0
mirror of https://github.com/frozenpandaman/s3s.git synced 2026-07-22 10:20:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix rank not being sent in monitoring mode (#46, #54)

Browse Source
This commit is contained in:
eli fessler 2022-11-18 01:19:25 -10:00
parent 4a9de614b1
commit c19cc47db6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
s3s.py
View File

@ -9,7 +9,7 @@ import msgpack
from packaging import version from packaging import version
import iksm, utils import iksm, utils
A_VERSION = "0.1.14" A_VERSION = "0.1.15"
DEBUG = False DEBUG = False
@ -620,6 +620,7 @@ def prepare_battle_result(battle, ismonitoring, isblackout, overview_data=None):
payload["knockout"] = "no" if battle["knockout"] is None or battle["knockout"] == "NEITHER" else "yes" payload["knockout"] = "no" if battle["knockout"] is None or battle["knockout"] == "NEITHER" else "yes"
payload["rank_exp_change"] = battle["bankaraMatch"]["earnedUdemaePoint"] payload["rank_exp_change"] = battle["bankaraMatch"]["earnedUdemaePoint"]
battle_id = base64.b64decode(battle["id"]).decode('utf-8')
if overview_data is None: # no passed in file with -i if overview_data is None: # no passed in file with -i
overview_post = requests.post(utils.GRAPHQL_URL, overview_post = requests.post(utils.GRAPHQL_URL,
data=utils.gen_graphql_body(utils.translate_rid["BankaraBattleHistoriesQuery"]), data=utils.gen_graphql_body(utils.translate_rid["BankaraBattleHistoriesQuery"]),
@ -641,7 +642,9 @@ def prepare_battle_result(battle, ismonitoring, isblackout, overview_data=None):
for parent in ranked_list: # groups in overview (ranked) JSON/screen for parent in ranked_list: # groups in overview (ranked) JSON/screen
for idx, child in enumerate(parent["historyDetails"]["nodes"]): for idx, child in enumerate(parent["historyDetails"]["nodes"]):
if child["id"] == battle["id"]: # found the battle ID in the other file overview_battle_id = base64.b64decode(child["id"]).decode('utf-8')
overview_battle_id_mutated = overview_battle_id.replace("BANKARA", "RECENT") # same battle, different screens
if overview_battle_id_mutated == battle_id: # found the battle ID in the other file
full_rank = re.split('([0-9]+)', child["udemae"].lower()) full_rank = re.split('([0-9]+)', child["udemae"].lower())
was_s_plus_before = len(full_rank) > 1 # true if "before" rank is s+ was_s_plus_before = len(full_rank) > 1 # true if "before" rank is s+
@ -1040,7 +1043,7 @@ def monitor_battles(which, secs, isblackout, istestrun):
mins = str(round(float(secs)/60.0, 2)) mins = str(round(float(secs)/60.0, 2))
mins = mins[:-2] if mins[-2:] == ".0" else mins mins = mins[:-2] if mins[-2:] == ".0" else mins
print(f"Waiting for new {utils.set_noun(which)}... (checking every {mins} minutes)") print(f"Waiting for new {utils.set_noun(which)}... (checking every {mins} minute{'s' if mins != '1' else ''})")
try: try:
while True: while True:
@ -1096,6 +1099,8 @@ def monitor_battles(which, secs, isblackout, istestrun):
stagename = result["data"]["vsHistoryDetail"]["vsStage"]["name"] stagename = result["data"]["vsHistoryDetail"]["vsStage"]["name"]
shortname = stagename.split(" ")[-1] shortname = stagename.split(" ")[-1]
if shortname == "d'Alfonsino": # lol franch
shortname = "Museum"
endtime = utils.epoch_time(result["data"]["vsHistoryDetail"]["playedTime"]) + \ endtime = utils.epoch_time(result["data"]["vsHistoryDetail"]["playedTime"]) + \
result["data"]["vsHistoryDetail"]["duration"] result["data"]["vsHistoryDetail"]["duration"]
dt = datetime.datetime.fromtimestamp(endtime).strftime('%I:%M:%S %p').lstrip("0") dt = datetime.datetime.fromtimestamp(endtime).strftime('%I:%M:%S %p').lstrip("0")