helpy4/bombsquad-plugin-manager
1
0
Fork 0
mirror of https://github.com/bombsquad-community/plugin-manager.git synced 2025-11-07 17:36:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removed depracated methods and some untested android fixes

Browse source
This commit is contained in:
brostosjoined 2024-01-11 11:53:21 +03:00
parent 3147334ec4
commit 43d42d4ef3
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
plugins/utilities/discord_richpresence.py
View file

@ -188,7 +188,7 @@ if ANDROID: # !can add ios in future
def identify(): def identify():
"""Identifying to the gateway and enable by using user token and the intents we will be using e.g 256->For Presence""" """Identifying to the gateway and enable by using user token and the intents we will be using e.g 256->For Presence"""
with open(f"{getcwd()}/token.txt", 'r') as f: with open(Path(f"{_babase.app.env.python_directory_user}/token.txt", 'r')) as f:
token = bytes.fromhex(f.read()).decode('utf-8') token = bytes.fromhex(f.read()).decode('utf-8')
identify_payload = { identify_payload = {
"op": 2, "op": 2,
@ -220,8 +220,11 @@ if ANDROID: # !can add ios in future
threading.Thread(target=heartbeats, daemon=True, name="heartbeat").start() threading.Thread(target=heartbeats, daemon=True, name="heartbeat").start()
def start(self): def start(self):
if Path(f"{getcwd()}/token.txt").exists(): if Path(f"{_babase.app.env.python_directory_user}/token.txt").exists():
threading.Thread(target=self.ws.run_forever, daemon=True, name="websocket").start() try:
threading.Thread(target=self.ws.run_forever, daemon=True, name="websocket").start()
except:
pass
def close(self): def close(self):
self.stop_heartbeat_thread.set() self.stop_heartbeat_thread.set()
@ -370,7 +373,7 @@ def get_event_loop(force_fresh=False):
def _generate_join_secret(self): def _generate_join_secret(self):
# resp = requests.get('https://legacy.ballistica.net/bsAccessCheck').text # resp = requests.get('https://legacy.ballistica.net/bsAccessCheck').text
connection_info = bs.get_connection_to_host_info() connection_info = bs.get_connection_to_host_info_2()
if connection_info: if connection_info:
addr = _last_server_addr addr = _last_server_addr
port = _last_server_port port = _last_server_port
@ -535,7 +538,7 @@ class Discordlogin(PopupWindow):
s = 1.25 if _uiscale is babase.UIScale.SMALL else 1.27 if _uiscale is babase.UIScale.MEDIUM else 1.3 s = 1.25 if _uiscale is babase.UIScale.SMALL else 1.27 if _uiscale is babase.UIScale.MEDIUM else 1.3
self._width = 380 * s self._width = 380 * s
self._height = 150 + 150 * s self._height = 150 + 150 * s
self.path = Path(f"{getcwd()}/token.txt") self.path = Path(f"{_babase.app.env.python_directory_user}/token.txt")
bg_color = (0.5, 0.4, 0.6) 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_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"
@ -794,14 +797,18 @@ class DiscordRP(babase.Plugin):
def on_app_running(self) -> None: def on_app_running(self) -> None:
if not ANDROID: if not ANDROID:
self.rpc_thread.start() self.rpc_thread.start()
self.update_timer = bs.AppTimer( self.update_timer = bs.AppTimer(
1, bs.WeakCall(self.update_status), repeat=True 1, bs.WeakCall(self.update_status), repeat=True
) )
if ANDROID: if ANDROID:
self.rpc_thread.start() self.rpc_thread.start()
self.update_timer = bs.AppTimer( try:
4, bs.WeakCall(self.update_status), repeat=True self.update_timer = bs.AppTimer(
) 4, bs.WeakCall(self.update_status), repeat=True
)
except:
pass
def has_settings_ui(self): def has_settings_ui(self):
return True return True
@ -869,7 +876,7 @@ class DiscordRP(babase.Plugin):
def update_status(self) -> None: def update_status(self) -> None:
roster = bs.get_game_roster() roster = bs.get_game_roster()
connection_info = bs.get_connection_to_host_info() connection_info = bs.get_connection_to_host_info_2()
self.rpc_thread.large_image_key = "bombsquadicon" self.rpc_thread.large_image_key = "bombsquadicon"
self.rpc_thread.large_image_text = "BombSquad" self.rpc_thread.large_image_text = "BombSquad"
@ -877,15 +884,14 @@ class DiscordRP(babase.Plugin):
self.rpc_thread.small_image_text = ( self.rpc_thread.small_image_text = (
f"{_babase.app.classic.platform.capitalize()}({APP_VERSION})" f"{_babase.app.classic.platform.capitalize()}({APP_VERSION})"
) )
connection_info = bs.get_connection_to_host_info()
if not ANDROID: if not ANDROID:
svinfo = str(connection_info) svinfo = str(connection_info)
if self._last_server_info != svinfo: if self._last_server_info != svinfo:
self._last_server_info = svinfo self._last_server_info = svinfo
self.rpc_thread.party_id = str(uuid.uuid4()) self.rpc_thread.party_id = str(uuid.uuid4())
self.rpc_thread._update_secret() self.rpc_thread._update_secret()
if connection_info != {}: if connection_info:
servername = connection_info["name"] servername = connection_info.name
self.rpc_thread.details = "Online" self.rpc_thread.details = "Online"
self.rpc_thread.party_size = max( self.rpc_thread.party_size = max(
1, sum(len(client["players"]) for client in roster) 1, sum(len(client["players"]) for client in roster)
@ -910,7 +916,7 @@ class DiscordRP(babase.Plugin):
else: else:
self.rpc_thread.state = servername[slice(19)] self.rpc_thread.state = servername[slice(19)]
if connection_info == {}: if not 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.state = self._get_current_activity_name()
self.rpc_thread.party_size = max(1, len(roster)) self.rpc_thread.party_size = max(1, len(roster))
@ -995,5 +1001,5 @@ class DiscordRP(babase.Plugin):
self.rpc_thread.large_image_key = ( self.rpc_thread.large_image_key = (
"https://media.tenor.com/uAqNn6fv7x4AAAAM/bombsquad-spaz.gif" "https://media.tenor.com/uAqNn6fv7x4AAAAM/bombsquad-spaz.gif"
) )
if ANDROID and Path(f"{getcwd()}/token.txt").exists(): if ANDROID and Path(f"{_babase.app.env.python_directory_user}/token.txt").exists():
self.rpc_thread.presence() self.rpc_thread.presence()