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

reset discord_richpresence

Browse source
This commit is contained in:
Loup-Garou911XD 2024-05-05 00:00:36 +05:30
parent 5e71b03bdc
commit 52d56ca5a1
4 changed files with 348 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
## Plugin Manager (dd-mm-yyyy) ## Plugin Manager (dd-mm-yyyy)
### 1.0.19 (05-05-2024)
- Fixed an issue where changelog were not found
### 1.0.18 (28-04-2024) ### 1.0.18 (28-04-2024)
- Fixed errors which were caused due to no internet connection. - Fixed errors which were caused due to no internet connection.

6
index.json
View file

@ -1,6 +1,12 @@
{ {
"plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py",
"versions": { "versions": {
"1.0.19": {
"api_version": 8,
"commit_sha": "30f0b9d",
"released_on": "04-05-2024",
"md5sum": "f0a9ed605dd91e2210a47a0cd6067ded"
},
"1.0.18": { "1.0.18": {
"api_version": 8, "api_version": 8,
"commit_sha": "5af504e", "commit_sha": "5af504e",

1
plugin_manager.py
View file

@ -1475,6 +1475,7 @@ class PluginManager:
def unset_index_global_cache(self): def unset_index_global_cache(self):
try: try:
del _CACHE["index"] del _CACHE["index"]
del _CACHE["changelog"]
except KeyError: except KeyError:
pass pass

514
plugins/utilities/discord_richpresence.py
View file

@ -4,8 +4,6 @@
# ba_meta require api 8 # ba_meta require api 8
#!"Made to you by @brostos & @Dliwk" #!"Made to you by @brostos & @Dliwk"
# TODO
# - Update to the latest libs and test then release and add the module in the mod file as bytes
from __future__ import annotations from __future__ import annotations
@ -37,92 +35,16 @@ if TYPE_CHECKING:
from typing import Any, Tuple from typing import Any, Tuple
MAPNAME_ID = {
"bombsquadicon": "963448129900908595",
"zigzagpreview": "963448133130522624",
"tiptoppreview": "963448133168279582",
"towerdpreview": "963448135886200912",
"thepadpreview": "963448137916248084",
"steprightuppreview": "963448141728862248",
"roundaboutpreview": "963448143997972550",
"rampagepreview": "963448146422296676",
"monkeyfacepreview": "963448151182831626",
"footballstadiumpreview": "963448158719983646",
"doomshroompreview": "963448160993292368",
"cragcastlepreview": "963448163048513536",
"courtyardpreview": "963448166127120504",
"bridgitpreview": "963448169180565654",
"biggpreview": "963448172905127996",
"alwayslandpreview": "963448174163423252",
"bigg": "1013013392455376977",
"bridgit": "1013013400139333632",
"courtyard": "1013013410776096788",
"cragcastle": "1013013423132528700",
"doomshroom": "1013013438223622224",
"footballstadium": "1013013452517810226",
"hockeystadium": "1013013464060547112",
"monkeyface": "1013013477721383023",
"rampage": "1013013484830728273",
"roundabout": "1013013508323037264",
"steprightup": "1013013567768907826",
"thepad": "1013013577197699163",
"tiptop": "1013013593089904721",
"towerd": "1013013604531970131",
"zigzag": "1013013618188619816",
"bombsquadlogo2": "1013016083701190726",
"windows": "1084050785488338984",
"linux": "1084078945944739920",
"lobby": "1084180821973418226",
"ranking": "1084224689272004719",
"rampagelevelcolor": "1086989941541703741",
"landmine": "1087000404866371766",
"rgbstripes": "1087000416492990474",
"shrapnel1color": "1087151233225195590",
"bonescolor": "1087151164077899928",
"bridgitlevelcolor": "1087151178674094182",
"crossout": "1087151197963681902",
"naturebackgroundcolor": "1087151209896476782",
"zigzaglevelcolor": "1087151253206876241",
"zoeicon": "1087151266989363240",
"bg": "1087564057890000906",
"alwayslandlevelcolor": "1087564765406167080",
"hockeystadiumpreview": "1087574349285961768",
"mac": "1087584375287336992",
"flyer": "1087584543147561051",
"replay": "1087592122393301102",
"coop": "1097697042891018311",
"ffa": "1097697050214269008",
"lobbysmall": "1097697055926923335",
"replaysmall": "1097697062746853386",
"teams": "1097697068727935036",
"bacongreece": "1097700754623565894",
"basketballstadium": "1097700771501441167",
"flapland": "1097700783622979664",
"alwaysland": "1097700794213613610",
"hoveringwood": "1097700802321199224",
"jrmponslaught": "1097700810479124520",
"jrmprunaround": "1097700817194205286",
"lakefrigid": "1097700828023898203",
"mushfeud": "1097700836920000594",
"pillar_bases": "1097700846340407427",
"powerup_factory": "1097700854422851656",
"snowballpit": "1097700869673341009",
"stoneishfort": "1097700887826272308",
"toiletdonut": "1097700898584666193",
"whereeaglesdare": "1097700904972587109",
"android": "1097728392280932453",
}
ANDROID = babase.app.classic.platform == "android" ANDROID = babase.app.classic.platform == "android"
DIRPATH = Path(
f"{_babase.app.python_directory_user if build_number < 21282 else _babase.app.env.python_directory_user}/image_id.json")
APP_VERSION = _babase.app.version if build_number < 21282 else _babase.app.env.version APP_VERSION = _babase.app.version if build_number < 21282 else _babase.app.env.version
if ANDROID: # !can add ios in future if ANDROID: # !can add ios in future
# Installing websocket # Installing websocket
def get_module(): def get_module():
install_path = Path( install_path = Path(f"{getcwd()}/ba_data/python") # For the guys like me on windows
f"{getcwd()}/ba_data/python"
) # For the guys like me on windows
path = Path(f"{install_path}/websocket.tar.gz") path = Path(f"{install_path}/websocket.tar.gz")
file_path = Path(f"{install_path}/websocket") file_path = Path(f"{install_path}/websocket")
source_dir = Path(f"{install_path}/websocket-client-1.6.1/websocket") source_dir = Path(f"{install_path}/websocket-client-1.6.1/websocket")
@ -137,10 +59,7 @@ if ANDROID: # !can add ios in future
filename, headers = urlretrieve(url, filename=path) filename, headers = urlretrieve(url, filename=path)
with open(filename, "rb") as f: with open(filename, "rb") as f:
content = f.read() content = f.read()
assert ( assert hashlib.md5(content).hexdigest() == "86bc69b61947943627afc1b351c0b5db"
hashlib.md5(content).hexdigest()
== "86bc69b61947943627afc1b351c0b5db"
)
shutil.unpack_archive(filename, install_path) shutil.unpack_archive(filename, install_path)
remove(path) remove(path)
shutil.copytree(source_dir, file_path) shutil.copytree(source_dir, file_path)
@ -150,7 +69,6 @@ if ANDROID: # !can add ios in future
shutil.rmtree(Path(f"{install_path}/websocket-client-1.6.1")) shutil.rmtree(Path(f"{install_path}/websocket-client-1.6.1"))
else: else:
pass pass
get_module() get_module()
from websocket import WebSocketConnectionClosedException from websocket import WebSocketConnectionClosedException
@ -160,18 +78,16 @@ if ANDROID: # !can add ios in future
class PresenceUpdate: class PresenceUpdate:
def __init__(self): def __init__(self):
self.ws = websocket.WebSocketApp( self.ws = websocket.WebSocketApp("wss://gateway.discord.gg/?encoding=json&v=10",
"wss://gateway.discord.gg/?encoding=json&v=10",
on_open=self.on_open, on_open=self.on_open,
on_message=self.on_message, on_message=self.on_message,
on_error=self.on_error, on_error=self.on_error,
on_close=self.on_close, on_close=self.on_close)
)
self.heartbeat_interval = int(41250) self.heartbeat_interval = int(41250)
self.resume_gateway_url: str | None = None self.resume_gateway_url: str | None = None
self.session_id: str | None = None self.session_id: str | None = None
self.stop_heartbeat_thread = threading.Event() self.stop_heartbeat_thread = threading.Event()
self.do_once: bool = True self.do_once = True
self.state: str | None = "In Game" self.state: str | None = "In Game"
self.details: str | None = "Main Menu" self.details: str | None = "Main Menu"
self.start_timestamp = time.time() self.start_timestamp = time.time()
@ -179,8 +95,7 @@ if ANDROID: # !can add ios in future
self.large_image_text: str | None = "BombSquad Icon" self.large_image_text: str | None = "BombSquad Icon"
self.small_image_key: str | None = None self.small_image_key: str | None = None
self.small_image_text: str | None = ( self.small_image_text: str | None = (
f"{_babase.app.classic.platform.capitalize()}({APP_VERSION})" f"{_babase.app.classic.platform.capitalize()}({APP_VERSION})")
)
self.media_proxy = "mp:/app-assets/963434684669382696/{}.png" self.media_proxy = "mp:/app-assets/963434684669382696/{}.png"
self.identify: bool = False self.identify: bool = False
self.party_id: str = str(uuid.uuid4()) self.party_id: str = str(uuid.uuid4())
@ -188,8 +103,10 @@ if ANDROID: # !can add ios in future
self.party_max = 8 self.party_max = 8
def presence(self): def presence(self):
largetxt = MAPNAME_ID[self.large_image_key] with open(DIRPATH, "r") as maptxt:
smalltxt = MAPNAME_ID[self.small_image_key] largetxt = json.load(maptxt)[self.large_image_key]
with open(DIRPATH, "r") as maptxt:
smalltxt = json.load(maptxt)[self.small_image_key]
presencepayload = { presencepayload = {
"op": 3, "op": 3,
@ -204,10 +121,12 @@ if ANDROID: # !can add ios in future
"application_id": "963434684669382696", "application_id": "963434684669382696",
"state": self.state, "state": self.state,
"details": self.details, "details": self.details,
"timestamps": {"start": start_time}, "timestamps": {
"start": start_time
},
"party": { "party": {
"id": self.party_id, "id": self.party_id,
"size": [self.party_size, self.party_max], "size": [self.party_size, self.party_max]
}, },
"assets": { "assets": {
"large_image": self.media_proxy.format(largetxt), "large_image": self.media_proxy.format(largetxt),
@ -252,13 +171,7 @@ if ANDROID: # !can add ios in future
babase.print_exception(error) babase.print_exception(error)
def on_close(self, ws, close_status_code, close_msg): def on_close(self, ws, close_status_code, close_msg):
(
print("Closed Discord Connection Successfully") print("Closed Discord Connection Successfully")
if close_status_code == 1000
else print(
f"Closed Discord Connection with code {close_status_code} and message {close_msg}"
)
)
def on_open(self, ws): def on_open(self, ws):
print("Connected to Discord Websocket") print("Connected to Discord Websocket")
@ -275,8 +188,8 @@ 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"""
byt_tkn = babase.app.config.get("token") with open(f"{_babase.app.env.python_directory_user}/__pycache__/token.txt", 'r') as f:
token = bytes.fromhex(byt_tkn).decode("utf-8") token = bytes.fromhex(f.read()).decode('utf-8')
identify_payload = { identify_payload = {
"op": 2, "op": 2,
"d": { "d": {
@ -290,7 +203,6 @@ if ANDROID: # !can add ios in future
}, },
} # step 3 send an identify } # step 3 send an identify
self.ws.send(json.dumps(identify_payload)) self.ws.send(json.dumps(identify_payload))
identify() identify()
while True: while True:
heartbeat_payload = {"op": 1, "d": self.heartbeat_interval} heartbeat_payload = {"op": 1, "d": self.heartbeat_interval}
@ -308,31 +220,8 @@ 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 ( if Path(f"{_babase.app.env.python_directory_user}/__pycache__/token.txt").exists():
Path( threading.Thread(target=self.ws.run_forever, daemon=True, name="websocket").start()
f"{_babase.app.env.python_directory_user}/__pycache__/token.txt"
).exists()
or Path(f"{getcwd()}/token.txt").exists()
):
try:
with open(f"{getcwd()}/token.txt", 'r') as f:
token = bytes.fromhex(f.read()).decode('utf-8')
except FileNotFoundError:
with open(f"{_babase.app.env.python_directory_user}/__pycache__/token.txt", 'r') as f:
token = bytes.fromhex(f.read()).decode('utf-8')
babase.app.config["token"] = token
babase.app.config.commit()
if babase.app.config.get("token"):
try:
while True:
urlopen('http://www.google.com', timeout=5)
threading.Thread(
target=self.ws.run_forever, daemon=True, name="websocket"
).start()
return
except Exception:
return
def close(self): def close(self):
self.stop_heartbeat_thread.set() self.stop_heartbeat_thread.set()
@ -353,10 +242,7 @@ if not ANDROID:
filename, headers = urlretrieve(url, filename=path) filename, headers = urlretrieve(url, filename=path)
with open(filename, "rb") as f: with open(filename, "rb") as f:
content = f.read() content = f.read()
assert ( assert hashlib.md5(content).hexdigest() == "f7c163cdd001af2456c09e241b90bad7"
hashlib.md5(content).hexdigest()
== "f7c163cdd001af2456c09e241b90bad7"
)
shutil.unpack_archive(filename, install_path) shutil.unpack_archive(filename, install_path)
shutil.copytree(source_dir, file_path) shutil.copytree(source_dir, file_path)
shutil.rmtree(Path(f"{install_path}/pypresence-4.3.0")) shutil.rmtree(Path(f"{install_path}/pypresence-4.3.0"))
@ -364,18 +250,54 @@ if not ANDROID:
except: except:
pass 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:
data = file.readlines()
data[45] = """
def get_event_loop(force_fresh=False):
loop = asyncio.ProactorEventLoop() if sys.platform == 'win32' else asyncio.new_event_loop()
if force_fresh:
return loop
try:
running = asyncio.get_running_loop()
except RuntimeError:
return loop
if running.is_closed():
return loop
else:
if sys.platform in ('linux', 'darwin'):
return running
if sys.platform == 'win32':
if isinstance(running, asyncio.ProactorEventLoop):
return running
else:
return loop"""
# 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):
file.write(line)
# fix the mess i did with the previous
elif file_path.exists():
with open(Path(f"{getcwd()}/ba_data/python/pypresence/utils.py"), "r") as file:
data = file.readlines()
first_line = data[0].rstrip("\n")
if not first_line == '"""Util functions that are needed but messy."""':
shutil.rmtree(file_path)
get_module()
get_module() get_module()
from pypresence import ( from pypresence import PipeClosed, DiscordError, DiscordNotFound
DiscordError,
DiscordNotFound,
)
from pypresence.utils import get_event_loop from pypresence.utils import get_event_loop
import pypresence import pypresence
import socket import socket
DEBUG = True DEBUG = True
_last_server_addr = 'localhost'
_last_server_port = 43210
def print_error(err: str, include_exception: bool = False) -> None: def print_error(err: str, include_exception: bool = False) -> None:
if DEBUG: if DEBUG:
if include_exception: if include_exception:
@ -404,7 +326,7 @@ if not ANDROID:
global _last_server_addr global _last_server_addr
global _last_server_port global _last_server_port
old_connect(*args, **kwargs) old_connect(*args, **kwargs)
_last_server_addr = kwargs.get("address") or args[0] c = kwargs.get("address") or args[0]
_last_server_port = kwargs.get("port") or args[1] _last_server_port = kwargs.get("port") or args[1]
bs.connect_to_party = new_connect bs.connect_to_party = new_connect
@ -437,43 +359,41 @@ if not ANDROID:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(0.01) s.settimeout(0.01)
try: try:
conn = s.connect_ex(("localhost", i)) conn = s.connect_ex(('localhost', i))
s.close() s.close()
if conn == 0: if (conn == 0):
s.close() s.close()
return True return (True)
except Exception as e: except:
raise (e)
s.close() s.close()
return False return (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
try: try:
connection_info = bs.get_connection_to_host_info if build_number < 21727 else bs.get_connection_to_host_info_2 connection_info = bs.get_connection_to_host_info(
if connection_info.__call__(): ) if build_number < 21727 else bs.get_connection_to_host_info_2()
if connection_info:
addr = _last_server_addr addr = _last_server_addr
port = _last_server_port port = _last_server_port
else: else:
with urlopen("https://legacy.ballistica.net/bsAccessCheck") as resp: with urlopen(
"https://legacy.ballistica.net/bsAccessCheck"
) as resp:
resp = resp.read().decode() resp = resp.read().decode()
resp = ast.literal_eval(resp) resp = ast.literal_eval(resp)
addr = resp["address"] addr = resp["address"]
port = resp["port"] port = 43210
addr, port = addr, port
secret_dict = { secret_dict = {
"format_version": 1, "format_version": 1,
"hostname": addr, "hostname": addr,
"port": port, "port": port,
} }
self.join_secret = json.dumps(secret_dict) self.join_secret = json.dumps(secret_dict)
print(self.join_secret) except:
except Exception as e:
print(e)
pass pass
def _update_secret(self): def _update_secret(self):
#! use in game thread
threading.Thread(target=self._generate_join_secret, daemon=True).start() threading.Thread(target=self._generate_join_secret, daemon=True).start()
self._last_secret_update_time = time.time() self._last_secret_update_time = time.time()
@ -535,7 +455,7 @@ if not ANDROID:
small_text=self.small_image_text, small_text=self.small_image_text,
party_id=self.party_id, party_id=self.party_id,
party_size=[self.party_size, self.party_max], party_size=[self.party_size, self.party_max],
join=self.join_secret) join=self.join_secret,
# buttons = [ #!cant use buttons together with join # buttons = [ #!cant use buttons together with join
# { # {
# "label": "Discord Server", # "label": "Discord Server",
@ -545,8 +465,10 @@ if not ANDROID:
# "label": "Download Bombsquad", # "label": "Download Bombsquad",
# "url": "https://bombsquad.ga/download"} # "url": "https://bombsquad.ga/download"}
# ] # ]
)
self.handle_event(data) self.handle_event(data)
except Exception: except (PipeClosed, DiscordError, AssertionError, AttributeError):
try: try:
self._reconnect() self._reconnect()
except (DiscordNotFound, DiscordError): except (DiscordNotFound, DiscordError):
@ -597,15 +519,12 @@ if not ANDROID:
babase.Call( babase.Call(
bui.screenmessage, bui.screenmessage,
"Discord: {}{} wants to join!".format( "Discord: {}{} wants to join!".format(
username, discriminator if discriminator != "#0" else "" username, discriminator if discriminator != "#0" else ""),
),
color=(0.0, 1.0, 0.0), color=(0.0, 1.0, 0.0),
), ),
from_other_thread=True, from_other_thread=True,
) )
babase.pushcall( babase.pushcall(lambda: bui.getsound('bellMed').play(), from_other_thread=True)
lambda: bui.getsound("bellMed").play(), from_other_thread=True
)
class Discordlogin(PopupWindow): class Discordlogin(PopupWindow):
@ -614,112 +533,92 @@ class Discordlogin(PopupWindow):
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
_uiscale = bui.app.ui_v1.uiscale _uiscale = bui.app.ui_v1.uiscale
self._transitioning_out = False self._transitioning_out = False
s = ( s = 1.25 if _uiscale is babase.UIScale.SMALL else 1.27 if _uiscale is babase.UIScale.MEDIUM else 1.3
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"{_babase.app.env.python_directory_user}/__pycache__/token.txt")
bg_color = (0.5, 0.4, 0.6) bg_color = (0.5, 0.4, 0.6)
log_btn_colour = ( log_btn_colour = (0.10, 0.95, 0.10) if not self.path.exists() else (1.00, 0.15, 0.15)
(0.10, 0.95, 0.10) log_txt = "LOG IN" if not self.path.exists() else "LOG OUT"
if not babase.app.config.get("token")
else (1.00, 0.15, 0.15)
)
log_txt = "LOG IN" if not babase.app.config.get("token") else "LOG OUT"
self.code = False self.code = False
self.resp = "Placeholder" self.resp = "Placeholder"
self.headers = { self.headers = {
"user-agent": "Mozilla/5.0", 'user-agent': "Mozilla/5.0",
"content-type": "application/json", 'content-type': "application/json",
} }
# creates our _root_widget # creates our _root_widget
PopupWindow.__init__( PopupWindow.__init__(self,
self,
position=(0.0, 0.0), position=(0.0, 0.0),
size=(self._width, self._height), size=(self._width, self._height),
scale=( scale=(2.1 if _uiscale is babase.UIScale.SMALL else 1.5
2.1 if _uiscale is babase.UIScale.MEDIUM else 1.0),
if _uiscale is babase.UIScale.SMALL bg_color=bg_color)
else 1.5 if _uiscale is babase.UIScale.MEDIUM else 1.0
),
bg_color=bg_color,
)
self._cancel_button = bui.buttonwidget( self._cancel_button = bui.buttonwidget(
parent=self.root_widget, parent=self.root_widget,
position=(25, self._height - 40), position=(25, self._height - 40),
size=(50, 50), size=(50, 50),
scale=0.58, scale=0.58,
label="", label='',
color=bg_color, color=bg_color,
on_activate_call=self._on_cancel_press, on_activate_call=self._on_cancel_press,
autoselect=True, autoselect=True,
icon=bui.gettexture("crossOut"), icon=bui.gettexture('crossOut'),
iconscale=1.2, iconscale=1.2)
)
bui.imagewidget( bui.imagewidget(parent=self.root_widget,
parent=self.root_widget,
position=(180, self._height - 55), position=(180, self._height - 55),
size=(32 * s, 32 * s), size=(32 * s, 32 * s),
texture=bui.gettexture("discordLogo"), texture=bui.gettexture("discordLogo"),
color=(10 - 0.32, 10 - 0.39, 10 - 0.96), color=(10 - 0.32, 10 - 0.39, 10 - 0.96))
)
self.email_widget = bui.textwidget( self.email_widget = bui.textwidget(parent=self.root_widget,
parent=self.root_widget,
text="Email/Phone Number", text="Email/Phone Number",
size=(400, 70), size=(400, 70),
position=(50, 180), position=(50, 180),
h_align="left", h_align='left',
v_align="center", v_align='center',
editable=True, editable=True,
scale=0.8, scale=0.8,
autoselect=True, autoselect=True,
maxwidth=220, maxwidth=220)
)
self.password_widget = bui.textwidget( self.password_widget = bui.textwidget(parent=self.root_widget,
parent=self.root_widget,
text="Password", text="Password",
size=(400, 70), size=(400, 70),
position=(50, 120), position=(50, 120),
h_align="left", h_align='left',
v_align="center", v_align='center',
editable=True, editable=True,
scale=0.8, scale=0.8,
autoselect=True, autoselect=True,
maxwidth=220, maxwidth=220)
)
bui.containerwidget(edit=self.root_widget, cancel_button=self._cancel_button) bui.containerwidget(edit=self.root_widget,
cancel_button=self._cancel_button)
bui.textwidget( bui.textwidget(
parent=self.root_widget, parent=self.root_widget,
position=(265, self._height - 37), position=(265, self._height - 37),
size=(0, 0), size=(0, 0),
h_align="center", h_align='center',
v_align="center", v_align='center',
scale=1.0, scale=1.0,
text="Discord", text="Discord",
maxwidth=200, maxwidth=200,
color=(0.80, 0.80, 0.80), color=(0.80, 0.80, 0.80))
)
bui.textwidget( bui.textwidget(
parent=self.root_widget, parent=self.root_widget,
position=(265, self._height - 78), position=(265, self._height - 78),
size=(0, 0), size=(0, 0),
h_align="center", h_align='center',
v_align="center", v_align='center',
scale=1.0, scale=1.0,
text="💀Use at your own risk💀\n ⚠️discord account might get terminated⚠️", text="💀Use at your own risk💀\n ⚠️discord account might get terminated⚠️",
maxwidth=200, maxwidth=200,
color=(1.00, 0.15, 0.15), color=(1.00, 0.15, 0.15))
)
self._login_button = bui.buttonwidget( self._login_button = bui.buttonwidget(
parent=self.root_widget, parent=self.root_widget,
@ -729,8 +628,7 @@ class Discordlogin(PopupWindow):
label=log_txt, label=log_txt,
color=log_btn_colour, color=log_btn_colour,
on_activate_call=self.login, on_activate_call=self.login,
autoselect=True, autoselect=True)
)
def _on_cancel_press(self) -> None: def _on_cancel_press(self) -> None:
self._transition_out() self._transition_out()
@ -738,10 +636,10 @@ class Discordlogin(PopupWindow):
def _transition_out(self) -> None: def _transition_out(self) -> None:
if not self._transitioning_out: if not self._transitioning_out:
self._transitioning_out = True self._transitioning_out = True
bui.containerwidget(edit=self.root_widget, transition="out_scale") bui.containerwidget(edit=self.root_widget, transition='out_scale')
def on_bascenev1libup_cancel(self) -> None: def on_bascenev1libup_cancel(self) -> None:
bui.getsound("swish").play() bui.getsound('swish').play()
self._transition_out() self._transition_out()
def backup_2fa_code(self, tickt): def backup_2fa_code(self, tickt):
@ -749,18 +647,16 @@ class Discordlogin(PopupWindow):
self.email_widget.delete() self.email_widget.delete()
self.password_widget.delete() self.password_widget.delete()
self.backup_2fa_widget = bui.textwidget( self.backup_2fa_widget = bui.textwidget(parent=self.root_widget,
parent=self.root_widget,
text="2FA/Discord Backup code", text="2FA/Discord Backup code",
size=(400, 70), size=(400, 70),
position=(50, 120), position=(50, 120),
h_align="left", h_align='left',
v_align="center", v_align='center',
editable=True, editable=True,
scale=0.8, scale=0.8,
autoselect=True, autoselect=True,
maxwidth=220, maxwidth=220)
)
json_data_2FA = { json_data_2FA = {
"code": bui.textwidget(query=self.backup_2fa_widget), "code": bui.textwidget(query=self.backup_2fa_widget),
@ -768,37 +664,36 @@ class Discordlogin(PopupWindow):
"ticket": tickt, "ticket": tickt,
} }
if json_data_2FA["code"] != "2FA/Discord Backup code": if json_data_2FA['code'] != "2FA/Discord Backup code":
try: try:
payload_2FA = json.dumps(json_data_2FA) payload_2FA = json.dumps(json_data_2FA)
conn_2FA = http.client.HTTPSConnection("discord.com") conn_2FA = http.client.HTTPSConnection("discord.com")
conn_2FA.request( conn_2FA.request("POST", "/api/v9/auth/mfa/totp", payload_2FA, self.headers)
"POST", "/api/v9/auth/mfa/totp", payload_2FA, self.headers
)
res_2FA = conn_2FA.getresponse().read() res_2FA = conn_2FA.getresponse().read()
token = json.loads(res_2FA)["token"].encode().hex().encode() token = json.loads(res_2FA)['token'].encode().hex().encode()
babase.app.config["token"] = token
babase.app.config.commit() with open(self.path, 'wb') as f:
f.write(token)
bui.screenmessage("Successfully logged in", (0.21, 1.0, 0.20)) bui.screenmessage("Successfully logged in", (0.21, 1.0, 0.20))
bui.getsound("shieldUp").play() bui.getsound('shieldUp').play()
self.on_bascenev1libup_cancel() self.on_bascenev1libup_cancel()
PresenceUpdate().start() PresenceUpdate().start()
except: except:
self.code = True self.code = True
bui.screenmessage("Incorrect code", (1.00, 0.15, 0.15)) bui.screenmessage("Incorrect code", (1.00, 0.15, 0.15))
bui.getsound("error").play() bui.getsound('error').play()
def login(self): def login(self):
if not babase.app.config.get("token") and self.code == False: if not self.path.exists() and self.code == False:
try: try:
json_data = { json_data = {
"login": bui.textwidget(query=self.email_widget), 'login': bui.textwidget(query=self.email_widget),
"password": bui.textwidget(query=self.password_widget), 'password': bui.textwidget(query=self.password_widget),
"undelete": False, 'undelete': False,
"captcha_key": None, 'captcha_key': None,
"login_source": None, 'login_source': None,
"gift_code_sku_id": None, 'gift_code_sku_id': None,
} }
conn = http.client.HTTPSConnection("discord.com") conn = http.client.HTTPSConnection("discord.com")
@ -810,30 +705,29 @@ class Discordlogin(PopupWindow):
res = conn.getresponse().read() res = conn.getresponse().read()
try: try:
token = json.loads(res)["token"].encode().hex().encode() token = json.loads(res)['token'].encode().hex().encode()
babase.app.config["token"] = token with open(self.path, 'wb') as f:
babase.app.config.commit() f.write(token)
bui.screenmessage("Successfully logged in", (0.21, 1.0, 0.20)) bui.screenmessage("Successfully logged in", (0.21, 1.0, 0.20))
bui.getsound("shieldUp").play() bui.getsound('shieldUp').play()
self.on_bascenev1libup_cancel() self.on_bascenev1libup_cancel()
PresenceUpdate().start() PresenceUpdate().start()
except KeyError: except KeyError:
try: try:
ticket = json.loads(res)["ticket"] ticket = json.loads(res)['ticket']
bui.screenmessage( bui.screenmessage("Input your 2FA or Discord Backup code",
"Input your 2FA or Discord Backup code", (0.21, 1.0, 0.20) (0.21, 1.0, 0.20))
) bui.getsound('error').play()
bui.getsound("error").play()
self.resp = ticket self.resp = ticket
self.backup_2fa_code(tickt=ticket) self.backup_2fa_code(tickt=ticket)
self.code = True self.code = True
except KeyError: except KeyError:
bui.screenmessage("Incorrect credentials", (1.00, 0.15, 0.15)) bui.screenmessage("Incorrect credentials", (1.00, 0.15, 0.15))
bui.getsound("error").play() bui.getsound('error').play()
except: except:
bui.screenmessage("Connect to the internet", (1.00, 0.15, 0.15)) bui.screenmessage("Connect to the internet", (1.00, 0.15, 0.15))
bui.getsound("error").play() bui.getsound('error').play()
conn.close() conn.close()
elif self.code == True: elif self.code == True:
@ -842,23 +736,52 @@ class Discordlogin(PopupWindow):
else: else:
self.email_widget.delete() self.email_widget.delete()
self.password_widget.delete() self.password_widget.delete()
del babase.app.config["token"] remove(self.path)
babase.app.config.commit() bui.getsound('shieldDown').play()
bui.getsound("shieldDown").play()
bui.screenmessage("Account successfully removed!!", (0.10, 0.10, 1.00)) bui.screenmessage("Account successfully removed!!", (0.10, 0.10, 1.00))
self.on_bascenev1libup_cancel() self.on_bascenev1libup_cancel()
PresenceUpdate().close() PresenceUpdate().close()
run_once = False
def get_once_asset():
global run_once
if run_once:
return
response = Request(
"https://discordapp.com/api/oauth2/applications/963434684669382696/assets",
headers={"User-Agent": "Mozilla/5.0"},
)
try:
with urlopen(response) as assets:
assets = json.loads(assets.read())
asset = []
asset_id = []
for x in assets:
dem = x["name"]
don = x["id"]
asset_id.append(don)
asset.append(dem)
asset_id_dict = dict(zip(asset, asset_id))
with open(DIRPATH, "w") as imagesets:
jsonfile = json.dumps(asset_id_dict)
json.dump(asset_id_dict, imagesets, indent=4)
except:
pass
run_once = True
def get_class(): def get_class():
if ANDROID: if ANDROID:
return PresenceUpdate() return PresenceUpdate()
elif not ANDROID: elif not ANDROID:
return RpcThread() return RpcThread()
# ba_meta export babase.Plugin # ba_meta export babase.Plugin
class DiscordRP(babase.Plugin): class DiscordRP(babase.Plugin):
def __init__(self) -> None: def __init__(self) -> None:
self.update_timer: bs.Timer | None = None self.update_timer: bs.Timer | None = None
@ -867,12 +790,11 @@ class DiscordRP(babase.Plugin):
if not ANDROID: if not ANDROID:
_run_overrides() _run_overrides()
get_once_asset()
def on_app_running(self) -> None: def on_app_running(self) -> None:
if not ANDROID: if not ANDROID:
threading.Thread( self.rpc_thread.start()
target=self.rpc_thread.start, daemon=True, name="start_rpc_android"
).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
@ -888,10 +810,8 @@ class DiscordRP(babase.Plugin):
def show_settings_ui(self, button): def show_settings_ui(self, button):
if not ANDROID: if not ANDROID:
bui.screenmessage( bui.screenmessage("Nothing here achievement!!!", (0.26, 0.65, 0.94))
"Nothing here achievement.Only for mobile users!!!", (0.26, 0.65, 0.94) bui.getsound('achievement').play()
)
bui.getsound("achievement").play()
if ANDROID: if ANDROID:
Discordlogin() Discordlogin()
@ -935,7 +855,7 @@ class DiscordRP(babase.Plugin):
if name == this: if name == this:
self.rpc_thread.large_image_key = "lobby" self.rpc_thread.large_image_key = "lobby"
self.rpc_thread.large_image_text = "Bombing up" self.rpc_thread.large_image_text = "Bombing up"
self.rpc_thread.small_image_key = "lobbysmall" # self.rpc_thread.small_image_key = "lobbysmall"
if name == "Ranking": if name == "Ranking":
self.rpc_thread.large_image_key = "ranking" self.rpc_thread.large_image_key = "ranking"
self.rpc_thread.large_image_text = "Viewing Results" self.rpc_thread.large_image_text = "Viewing Results"
@ -951,14 +871,8 @@ class DiscordRP(babase.Plugin):
def update_status(self) -> None: def update_status(self) -> None:
roster = bs.get_game_roster() roster = bs.get_game_roster()
try: connection_info = bs.get_connection_to_host_info(
connection_info = ( ) if build_number < 21727 else bs.get_connection_to_host_info_2()
bs.get_connection_to_host_info()
if build_number < 21727
else bs.get_connection_to_host_info_2()
)
except (RuntimeError, TypeError):
pass
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"
@ -966,14 +880,12 @@ 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})"
) )
try:
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"
@ -985,9 +897,9 @@ class DiscordRP(babase.Plugin):
self.rpc_thread.state = "Private Party" self.rpc_thread.state = "Private Party"
elif servername == "": # A local game joinable from the internet elif servername == "": # A local game joinable from the internet
try: try:
offlinename = json.loads( offlinename = json.loads(bs.get_game_roster()[0]["spec_string"])[
bs.get_game_roster()[0]["spec_string"] "n"
)["n"] ]
if len(offlinename) > 19: # Thanks Rikko if len(offlinename) > 19: # Thanks Rikko
self.rpc_thread.state = offlinename[slice(19)] + "..." self.rpc_thread.state = offlinename[slice(19)] + "..."
else: else:
@ -1001,9 +913,7 @@ class DiscordRP(babase.Plugin):
self.rpc_thread.state = servername[slice(19)] self.rpc_thread.state = servername[slice(19)]
if not connection_info: if not connection_info:
self.rpc_thread.details = ( self.rpc_thread.details = "Local" # ! replace with something like ballistica github cause
"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))
self.rpc_thread.party_max = max(1, bs.get_public_party_max_size()) self.rpc_thread.party_max = max(1, bs.get_public_party_max_size())
@ -1016,25 +926,19 @@ class DiscordRP(babase.Plugin):
bs.get_foreground_host_session() bs.get_foreground_host_session()
.__class__.__name__.replace("MainMenuSession", "") .__class__.__name__.replace("MainMenuSession", "")
.replace("EndSession", "") .replace("EndSession", "")
.replace("FreeForAllSession", ": FFA") .replace("FreeForAllSession", ": FFA") # ! for session use small image key
.replace("DualTeamSession", ": Teams") .replace("DualTeamSession", ": Teams")
.replace("CoopSession", ": Coop") .replace("CoopSession", ": Coop")
) )
if len(session) > 1: #! self.rpc_thread.small_image_key = session.lower()
self.rpc_thread.small_image_key = session.replace( self.rpc_thread.details = f"{self.rpc_thread.details} {session}"
": ", ""
).lower()
self.rpc_thread.small_image_text = session.replace(": ", "")
self.rpc_thread.details = self.rpc_thread.details
if ( if (
self.rpc_thread.state == "NoneType" self.rpc_thread.state == "NoneType"
): # sometimes the game just breaks which means its not really watching replay FIXME ): # sometimes the game just breaks which means its not really watching replay FIXME
self.rpc_thread.state = "Watching Replay" self.rpc_thread.state = "Watching Replay"
self.rpc_thread.large_image_key = "replay" self.rpc_thread.large_image_key = "replay"
self.rpc_thread.large_image_text = "Viewing Awesomeness" self.rpc_thread.large_image_text = "Viewing Awesomeness"
self.rpc_thread.small_image_key = "replaysmall" #!self.rpc_thread.small_image_key = "replaysmall"
except UnboundLocalError:
pass
act = bs.get_foreground_host_activity() act = bs.get_foreground_host_activity()
session = bs.get_foreground_host_session() session = bs.get_foreground_host_session()
@ -1042,8 +946,6 @@ class DiscordRP(babase.Plugin):
from bascenev1lib.game.elimination import EliminationGame from bascenev1lib.game.elimination import EliminationGame
from bascenev1lib.game.thelaststand import TheLastStandGame from bascenev1lib.game.thelaststand import TheLastStandGame
from bascenev1lib.game.meteorshower import MeteorShowerGame from bascenev1lib.game.meteorshower import MeteorShowerGame
from bascenev1lib.game.football import FootballCoopGame
from bascenev1lib.game.easteregghunt import EasterEggHuntGame
# noinspection PyUnresolvedReferences,PyProtectedMember # noinspection PyUnresolvedReferences,PyProtectedMember
try: try:
@ -1071,26 +973,6 @@ class DiscordRP(babase.Plugin):
else: else:
secfmt = f"{int(sec) // 60:02}:{sec:.2f}" secfmt = f"{int(sec) // 60:02}:{sec:.2f}"
self.rpc_thread.details += f" ({secfmt})" self.rpc_thread.details += f" ({secfmt})"
# elif isinstance(act, OnslaughtGame):
# score = act._score
# level = act._wavenum
# # self.
elif isinstance(act, FootballCoopGame):
# try:
# score = f"{act.teams[0].score} : {act.teams[1].score}"
# except IndexError:
score = f"{act.teams[0].score} : {act._bot_team.score}"
self.rpc_thread.details = score
# elif isinstance(act, RunaroundGame)
# score = act._score
# level = act._wavenum
# lives = act._lives
elif isinstance(act, EasterEggHuntGame):
eggs_collected = len(act._eggs) - 1
self.rpc_thread.details = f"{eggs_collected} eggs collected"
# elif isinstance(act, TargetPracticeGame):
# #for FFA
# scoere = bs.get_foreground_host_activity().players[0].score
# if isinstance(session, ba.DualTeamSession): # if isinstance(session, ba.DualTeamSession):
# scores = ':'.join([ # scores = ':'.join([
@ -1101,12 +983,13 @@ class DiscordRP(babase.Plugin):
mapname, short_map_name = self._get_current_map_name() mapname, short_map_name = self._get_current_map_name()
if mapname: if mapname:
asset_keys = MAPNAME_ID.keys() with open(DIRPATH, 'r') as asset_dict:
asset_keys = json.load(asset_dict).keys()
if short_map_name in asset_keys: if short_map_name in asset_keys:
self.rpc_thread.large_image_text = mapname self.rpc_thread.large_image_text = mapname
self.rpc_thread.large_image_key = short_map_name self.rpc_thread.large_image_key = short_map_name
# self.rpc_thread.small_image_key = 'bombsquadlogo2' self.rpc_thread.small_image_key = 'bombsquadlogo2'
# self.rpc_thread.small_image_text = 'BombSquad' self.rpc_thread.small_image_text = 'BombSquad'
if _babase.get_idle_time() / (1000 * 60) % 60 >= 0.4: if _babase.get_idle_time() / (1000 * 60) % 60 >= 0.4:
self.rpc_thread.details = f"AFK in {self.rpc_thread.details}" self.rpc_thread.details = f"AFK in {self.rpc_thread.details}"
@ -1114,6 +997,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 babase.app.config.get("token"): if ANDROID and Path(f"{_babase.app.env.python_directory_user}/__pycache__/token.txt").exists():
#! This function might cause some errors
self.rpc_thread.presence() self.rpc_thread.presence()