[ci] auto-format

This commit is contained in:
brostosjoined 2023-07-28 23:35:32 +00:00 committed by github-actions[bot]
parent 4baa419f8a
commit 7f075d02ec

View file

@ -24,7 +24,7 @@ import shutil
import hashlib
import babase
import _babase
import bascenev1 as bs
import bascenev1 as bs
import bascenev1lib
import bauiv1 as bui
@ -66,16 +66,15 @@ if ANDROID: # !can add ios in future
from websocket import WebSocketConnectionClosedException
import websocket
start_time = time.time()
class PresenceUpdate:
def __init__(self):
self.ws = websocket.WebSocketApp("wss://gateway.discord.gg/?encoding=json&v=10",
on_open=self.on_open,
on_message=self.on_message,
on_error=self.on_error,
on_close=self.on_close)
on_open=self.on_open,
on_message=self.on_message,
on_error=self.on_error,
on_close=self.on_close)
self.heartbeat_interval = int(41250)
self.resume_gateway_url: str | None = None
self.session_id: str | None = None
@ -199,30 +198,27 @@ if ANDROID: # !can add ios in future
identify()
while True:
heartbeat_payload = {"op": 1, "d": self.heartbeat_interval}
try:
self.ws.send(json.dumps(heartbeat_payload))
time.sleep(self.heartbeat_interval / 1000)
except:
pass
if self.stop_heartbeat_thread.is_set():
self.stop_heartbeat_thread.clear()
break
threading.Thread(target=heartbeats, daemon=True, name="heartbeat").start()
def start(self):
if Path(f"{getcwd()}/token.txt").exists():
threading.Thread(target=self.ws.run_forever, daemon=True, name="websocket").start()
def close(self):
self.stop_heartbeat_thread.set()
self.do_once = True
self.ws.close()
if not ANDROID:
@ -239,13 +235,13 @@ if not ANDROID:
with open(filename, "rb") as f:
content = f.read()
assert hashlib.md5(content).hexdigest() == "f7c163cdd001af2456c09e241b90bad7"
shutil.unpack_archive( filename, install_path)
shutil.unpack_archive(filename, install_path)
shutil.copytree(source_dir, file_path)
shutil.rmtree(Path(f"{install_path}/pypresence-4.3.0"))
remove(path)
except:
pass
# Make modifications for it to work on windows
if babase.app.classic.platform == "windows":
with open(Path(f"{getcwd()}/ba_data/python/pypresence/utils.py"), "r") as file:
@ -269,24 +265,23 @@ def get_event_loop(force_fresh=False):
return running
else:
return loop"""
#Thanks Loup
# Thanks Loup
with open(Path(f"{getcwd()}/ba_data/python/pypresence/utils.py"), "w") as file:
for number, line in enumerate(data):
if number not in range(46,56):
if number not in range(46, 56):
file.write(line)
get_module()
from pypresence import PipeClosed, DiscordError, DiscordNotFound
from pypresence.utils import get_event_loop
import pypresence
import pypresence
import socket
DEBUG = True
_last_server_addr = 'localhost'
_last_server_port = 43210
def print_error(err: str, include_exception: bool = False) -> None:
if DEBUG:
if include_exception:
@ -317,8 +312,8 @@ def get_event_loop(force_fresh=False):
old_connect(*args, **kwargs)
c = kwargs.get("address") or args[0]
_last_server_port = kwargs.get("port") or args[1]
bs.connect_to_party = new_connect
bs.connect_to_party = new_connect
start_time = time.time()
@ -341,10 +336,10 @@ def get_event_loop(force_fresh=False):
self._last_secret_update_time: float = 0
self._last_connect_time: float = 0
self.should_close = False
@staticmethod
@staticmethod
def is_discord_running():
for i in range(6463,6473):
for i in range(6463, 6473):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(0.01)
try:
@ -352,11 +347,11 @@ def get_event_loop(force_fresh=False):
s.close()
if (conn == 0):
s.close()
return(True)
return (True)
except:
s.close()
return(False)
return (False)
def _generate_join_secret(self):
# resp = requests.get('https://legacy.ballistica.net/bsAccessCheck').text
connection_info = bs.get_connection_to_host_info()
@ -413,7 +408,7 @@ def get_event_loop(force_fresh=False):
self._subscribe("ACTIVITY_JOIN")
self._subscribe("ACTIVITY_JOIN_REQUEST")
# def _update_presence(self) -> None:
# def _update_presence(self) -> None:
# self._last_update_time = time.time()
# try:
# self._do_update_presence()
@ -422,7 +417,6 @@ def get_event_loop(force_fresh=False):
# self._reconnect()
# except Exception:
# print_error("failed to update presence", include_exception= True)
def _reconnect(self) -> None:
self.rpc.connect()
@ -499,7 +493,7 @@ def get_event_loop(force_fresh=False):
def _connect_to_party(self, hostname, port) -> None:
babase.pushcall(
babase.Call(bs.connect_to_party, hostname, port), from_other_thread=True
)
)
def on_join_request(self, username, uid, discriminator, avatar) -> None:
del uid # unused
@ -507,7 +501,8 @@ def get_event_loop(force_fresh=False):
babase.pushcall(
babase.Call(
bui.screenmessage,
"Discord: {}{} wants to join!".format(username, discriminator if discriminator != "#0" else ""),
"Discord: {}{} wants to join!".format(
username, discriminator if discriminator != "#0" else ""),
color=(0.0, 1.0, 0.0),
),
from_other_thread=True,
@ -527,15 +522,13 @@ class Discordlogin(PopupWindow):
self.path = Path(f"{getcwd()}/token.txt")
bg_color = (0.5, 0.4, 0.6)
log_btn_colour = (0.10, 0.95, 0.10) if not self.path.exists() else (1.00, 0.15, 0.15)
log_txt = "LOG IN" if not self.path.exists() else "LOG OUT"
log_txt = "LOG IN" if not self.path.exists() else "LOG OUT"
self.code = False
self.resp = "Placeholder"
self.headers = {
'user-agent': "Mozilla/5.0",
'content-type': "application/json",
}
'user-agent': "Mozilla/5.0",
'content-type': "application/json",
}
# creates our _root_widget
PopupWindow.__init__(self,
@ -544,7 +537,6 @@ class Discordlogin(PopupWindow):
scale=(2.1 if _uiscale is babase.UIScale.SMALL else 1.5
if _uiscale is babase.UIScale.MEDIUM else 1.0),
bg_color=bg_color)
self._cancel_button = bui.buttonwidget(
parent=self.root_widget,
@ -557,44 +549,38 @@ class Discordlogin(PopupWindow):
autoselect=True,
icon=bui.gettexture('crossOut'),
iconscale=1.2)
bui.imagewidget(parent=self.root_widget,
position=(180, self._height - 55),
size=(32 * s, 32 * s),
texture=bui.gettexture("discordLogo"),
color=(10 - 0.32, 10 - 0.39, 10 - 0.96))
bui.imagewidget(parent=self.root_widget,
position=(180, self._height - 55),
size=(32 * s, 32 * s),
texture=bui.gettexture("discordLogo"),
color=(10 - 0.32, 10 - 0.39, 10 - 0.96))
self.email_widget = bui.textwidget(parent=self.root_widget,
text="Email/Phone Number",
size=(400, 70),
position=(50, 180),
h_align='left',
v_align='center',
editable=True,
scale=0.8,
autoselect=True,
maxwidth=220)
text="Email/Phone Number",
size=(400, 70),
position=(50, 180),
h_align='left',
v_align='center',
editable=True,
scale=0.8,
autoselect=True,
maxwidth=220)
self.password_widget = bui.textwidget(parent=self.root_widget,
text="Password",
size=(400, 70),
position=(50, 120),
h_align='left',
v_align='center',
editable=True,
scale=0.8,
autoselect=True,
maxwidth=220)
text="Password",
size=(400, 70),
position=(50, 120),
h_align='left',
v_align='center',
editable=True,
scale=0.8,
autoselect=True,
maxwidth=220)
bui.containerwidget(edit=self.root_widget,
cancel_button=self._cancel_button)
cancel_button=self._cancel_button)
bui.textwidget(
parent=self.root_widget,
position=(265, self._height - 37),
@ -605,7 +591,7 @@ class Discordlogin(PopupWindow):
text="Discord",
maxwidth=200,
color=(0.80, 0.80, 0.80))
bui.textwidget(
parent=self.root_widget,
position=(265, self._height - 78),
@ -616,8 +602,7 @@ class Discordlogin(PopupWindow):
text="💀Use at your own risk💀\ndiscord account might get terminated⚠",
maxwidth=200,
color=(1.00, 0.15, 0.15))
self._login_button = bui.buttonwidget(
parent=self.root_widget,
position=(120, 65),
@ -639,33 +624,29 @@ class Discordlogin(PopupWindow):
def on_bascenev1libup_cancel(self) -> None:
bui.getsound('swish').play()
self._transition_out()
def backup_2fa_code(self, tickt):
if babase.do_once():
self.email_widget.delete()
self.password_widget.delete()
self.backup_2fa_widget = bui.textwidget(parent=self.root_widget,
text="2FA/Discord Backup code",
size=(400, 70),
position=(50, 120),
h_align='left',
v_align='center',
editable=True,
scale=0.8,
autoselect=True,
maxwidth=220)
text="2FA/Discord Backup code",
size=(400, 70),
position=(50, 120),
h_align='left',
v_align='center',
editable=True,
scale=0.8,
autoselect=True,
maxwidth=220)
json_data_2FA = {
"code": bui.textwidget(query=self.backup_2fa_widget),
"gift_code_sku_id": None,
"ticket": tickt,
"code": bui.textwidget(query=self.backup_2fa_widget),
"gift_code_sku_id": None,
"ticket": tickt,
}
if json_data_2FA['code'] != "2FA/Discord Backup code":
try:
payload_2FA = json.dumps(json_data_2FA)
@ -673,7 +654,7 @@ class Discordlogin(PopupWindow):
conn_2FA.request("POST", "/api/v9/auth/mfa/totp", payload_2FA, self.headers)
res_2FA = conn_2FA.getresponse().read()
token = json.loads(res_2FA)['token'].encode().hex().encode()
with open(self.path, 'wb') as f:
f.write(token)
bui.screenmessage("Successfully logged in", (0.21, 1.0, 0.20))
@ -684,11 +665,11 @@ class Discordlogin(PopupWindow):
self.code = True
bui.screenmessage("Incorrect code", (1.00, 0.15, 0.15))
bui.getsound('error').play()
def login(self):
if not self.path.exists() and self.code == False:
try:
json_data = {
'login': bui.textwidget(query=self.email_widget),
'password': bui.textwidget(query=self.password_widget),
@ -697,7 +678,7 @@ class Discordlogin(PopupWindow):
'login_source': None,
'gift_code_sku_id': None,
}
conn = http.client.HTTPSConnection("discord.com")
payload = json.dumps(json_data)
@ -705,9 +686,7 @@ class Discordlogin(PopupWindow):
# res = conn.getresponse().read()
conn.request("POST", "/api/v9/auth/login", payload, self.headers)
res = conn.getresponse().read()
try:
token = json.loads(res)['token'].encode().hex().encode()
with open(self.path, 'wb') as f:
@ -716,27 +695,27 @@ class Discordlogin(PopupWindow):
bui.getsound('shieldUp').play()
self.on_bascenev1libup_cancel()
PresenceUpdate().start()
except KeyError:
except KeyError:
try:
ticket = json.loads(res)['ticket']
bui.screenmessage("Input your 2FA or Discord Backup code", (0.21, 1.0, 0.20))
bui.screenmessage("Input your 2FA or Discord Backup code",
(0.21, 1.0, 0.20))
bui.getsound('error').play()
self.resp = ticket
self.resp = ticket
self.backup_2fa_code(tickt=ticket)
self.code = True
except KeyError:
bui.screenmessage("Incorrect credentials", (1.00, 0.15, 0.15))
bui.getsound('error').play()
except:
except:
bui.screenmessage("Connect to the internet", (1.00, 0.15, 0.15))
bui.getsound('error').play()
conn.close()
elif self.code == True:
self.backup_2fa_code(tickt=self.resp)
else:
self.email_widget.delete()
self.password_widget.delete()
@ -746,8 +725,10 @@ class Discordlogin(PopupWindow):
self.on_bascenev1libup_cancel()
PresenceUpdate().ws.close()
run_once = False
def get_once_asset():
global run_once
if run_once:
@ -775,6 +756,7 @@ def get_once_asset():
pass
run_once = True
def get_class():
if ANDROID:
return PresenceUpdate()
@ -795,7 +777,7 @@ class DiscordRP(babase.Plugin):
def on_app_running(self) -> None:
if not ANDROID:
self.rpc_thread.start()
self.rpc_thread.start()
self.update_timer = bs.AppTimer(
1, bs.WeakCall(self.update_status), repeat=True
)
@ -822,17 +804,17 @@ class DiscordRP(babase.Plugin):
def on_app_pause(self) -> None:
self.rpc_thread.close()
def on_app_resume(self) -> None:
global start_time
global start_time
start_time = time.time()
self.rpc_thread.start()
def _get_current_activity_name(self) -> str | None:
act = bs.get_foreground_host_activity()
if isinstance(act, bs.GameActivity):
return act.name
this = "Lobby"
name: str | None = (
act.__class__.__name__.replace("Activity", "")
@ -900,7 +882,7 @@ class DiscordRP(babase.Plugin):
offlinename = json.loads(bs.get_game_roster()[0]["spec_string"])[
"n"
]
if len(offlinename) > 19: # Thanks Rikko
if len(offlinename) > 19: # Thanks Rikko
self.rpc_thread.state = offlinename[slice(19)] + "..."
else:
self.rpc_thread.state = offlinename
@ -913,7 +895,7 @@ class DiscordRP(babase.Plugin):
self.rpc_thread.state = servername[slice(19)]
if connection_info == {}:
self.rpc_thread.details = "Local" #! replace with something like ballistica github cause
self.rpc_thread.details = "Local" # ! replace with something like ballistica github cause
self.rpc_thread.state = self._get_current_activity_name()
self.rpc_thread.party_size = max(1, len(roster))
self.rpc_thread.party_max = max(1, bs.get_public_party_max_size())
@ -926,7 +908,7 @@ class DiscordRP(babase.Plugin):
bs.get_foreground_host_session()
.__class__.__name__.replace("MainMenuSession", "")
.replace("EndSession", "")
.replace("FreeForAllSession", ": FFA") #! for session use small image key
.replace("FreeForAllSession", ": FFA") # ! for session use small image key
.replace("DualTeamSession", ": Teams")
.replace("CoopSession", ": Coop")
)
@ -999,4 +981,3 @@ class DiscordRP(babase.Plugin):
)
if ANDROID and Path(f"{getcwd()}/token.txt").exists():
self.rpc_thread.presence()