From 8a3e487df6d2ec104ffd3c3ec1e47584db0471e6 Mon Sep 17 00:00:00 2001 From: Xarkam Date: Wed, 18 Mar 2026 17:15:23 +0100 Subject: [PATCH] Branchement de discord oauth --- src/main.py | 23 ++++++++++++----------- src/tools/constants.py | 1 - src/tools/discord_oauth.py | 2 +- src/ui/main_window.py | 8 ++++++-- ui/mainwindow_vertical_pager.ui | 2 +- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main.py b/src/main.py index 0163f71..0dffa14 100644 --- a/src/main.py +++ b/src/main.py @@ -72,17 +72,18 @@ if __name__ == "__main__": # On récupère l'ID stocké (sera "" si absent grâce au schéma) stored_user_id = config.get_discord_user() - if not CheckDiscord.isuserconnected(): - msg = CustomMessageBox( - title="La Tanière: connexion Discord", - message="Tu n'est pas connecté à Discord\n\n" - "Assure-toi que tu es connecté à Discord.\n\n" - "Lorsque cela sera fait, relance le launcher.", - icon_type=CustomMessageBox.WARNING, - buttons=CustomMessageBox.OK - ) - msg.exec() - sys.exit(0) # On quitte proprement sans lancer MainWindow + if stored_user_id != "" or not stored_user_id.isspace(): + if not CheckDiscord.isuserconnected(stored_user_id): + msg = CustomMessageBox( + title="La Tanière: connexion Discord", + message="Tu n'est pas connecté à Discord\n\n" + "Assure-toi que tu es connecté à Discord.\n\n" + "Lorsque cela sera fait, relance le launcher.", + icon_type=CustomMessageBox.WARNING, + buttons=CustomMessageBox.OK + ) + msg.exec() + sys.exit(0) # On quitte proprement sans lancer MainWindow # 4. Lancement de l'application si tout est OK window = MainWindow(bundle_dir, config) diff --git a/src/tools/constants.py b/src/tools/constants.py index 0515a95..0eece22 100644 --- a/src/tools/constants.py +++ b/src/tools/constants.py @@ -7,7 +7,6 @@ from PySide6.QtGui import QColor # --------------------------------------------------------------------------- NO_STAFF = True -NO_DISCORD = True # --------------------------------------------------------------------------- # ENUMS diff --git a/src/tools/discord_oauth.py b/src/tools/discord_oauth.py index c7d6401..3ddc49d 100644 --- a/src/tools/discord_oauth.py +++ b/src/tools/discord_oauth.py @@ -3,7 +3,7 @@ import webbrowser import os from urllib.parse import urlencode from http.server import HTTPServer, BaseHTTPRequestHandler -from get_server_token import GetServerTokenForDiscord +from tools.get_server_token import GetServerTokenForDiscord # Disable stderr output os.environ['PYTHONWARNINGS'] = 'ignore' diff --git a/src/ui/main_window.py b/src/ui/main_window.py index 6f5e73b..678e8dd 100644 --- a/src/ui/main_window.py +++ b/src/ui/main_window.py @@ -11,7 +11,9 @@ from config.config_manager import ConfigManager from controllers.audio_controller import AudioController from controllers.glow_animator import GlowAnimator from controllers.window_dragger import WindowDragger -from tools.constants import NO_DISCORD, NO_STAFF, Urls +from tools import discord_oauth +from tools.constants import NO_STAFF, Urls + from fake_patch_notes import patch_note # For Linux Wayland to authorize moving window @@ -43,7 +45,7 @@ class MainWindow(QMainWindow): break # self.ui.spacer_substitution.hide() - if NO_DISCORD: + if config_manager.get_discord_user() == "" or config_manager.get_discord_user().isspace(): self.ui.queue_lbl.hide() self.ui.queue_position.hide() self.ui.stackedWidget.setCurrentIndex(1) @@ -98,6 +100,8 @@ class MainWindow(QMainWindow): self._glow.start() def _on_discord_auth_btn(self) -> None: + self.config.set_discord_user(discord_oauth.get_discord_user_id()) + self.config.save() self.ui.stackedWidget.setCurrentIndex(0) # ------------------------------------------------------------------ diff --git a/ui/mainwindow_vertical_pager.ui b/ui/mainwindow_vertical_pager.ui index 2bc6420..0664e7e 100644 --- a/ui/mainwindow_vertical_pager.ui +++ b/ui/mainwindow_vertical_pager.ui @@ -640,7 +640,7 @@ QFrame::Shape::NoFrame - 1 + 0