Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion actions/DiscordCore.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ def __init__(self, *args, **kwargs):

def on_ready(self):
super().on_ready()
self.plugin_base.setup_backend()
self.display_icon()
self.display_color()

Expand Down
4 changes: 4 additions & 0 deletions backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,16 @@ def _update_tokens(self, access_token: str = "", refresh_token: str = ""):

def setup_client(self):
try:
log.debug("new client")
self.discord_client = AsyncDiscord(
self.client_id, self.client_secret)
log.debug("connect")
self.discord_client.connect(self.discord_callback)
if not self.access_token:
log.debug("authorize")
self.discord_client.authorize()
else:
log.debug("authenticate")
self.discord_client.authenticate(self.access_token)
except Exception as ex:
self.frontend.on_auth_callback(False, str(ex))
Expand Down
21 changes: 10 additions & 11 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def __init__(self):
self.lm.set_to_os_default()
self._settings_manager = PluginSettings(self)
self.has_plugin_settings = True
self._mutex = threading.Lock()
self._add_icons()
self._register_actions()
backend_path = os.path.join(self.PATH, 'backend.py')
Expand All @@ -54,6 +53,7 @@ def __init__(self):
)

self.add_css_stylesheet(os.path.join(self.PATH, "style.css"))
self.setup_backend()

def _add_icons(self):
self.add_icon("deafen", self.get_asset_path("deafen.png"))
Expand Down Expand Up @@ -130,16 +130,15 @@ def _register_actions(self):
self.add_action_holder(toggle_ptt)

def setup_backend(self):
with self._mutex:
if self.backend and self.backend.is_authed():
return
settings = self.get_settings()
client_id = settings.get('client_id', '')
client_secret = settings.get('client_secret', '')
access_token = settings.get('access_token', '')
refresh_token = settings.get('refresh_token', '')
threading.Thread(target=self.backend.update_client_credentials, daemon=True, args=[
client_id, client_secret, access_token, refresh_token]).start()
if self.backend and self.backend.is_authed():
return
settings = self.get_settings()
client_id = settings.get('client_id', '')
client_secret = settings.get('client_secret', '')
access_token = settings.get('access_token', '')
refresh_token = settings.get('refresh_token', '')
threading.Thread(target=self.backend.update_client_credentials, daemon=True, args=[
client_id, client_secret, access_token, refresh_token]).start()

def save_access_token(self, access_token: str):
settings = self.get_settings()
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.4.7",
"version": "1.4.8",
"thumbnail": "store/thumbnail.png",
"id": "com_imdevinc_StreamControllerDiscordPlugin",
"name": "Discord",
Expand Down