Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main.py

src/main.py

@@ -60,7 +60,7 @@ if __name__ == "__main__":
     # 3. Garde-fou Discord
     if not CheckDiscord.isdiscordrunning():
         msg = CustomMessageBox(
-            title="Launcher La Tanière: Discord non détecté",
+            title="La Tanière: Discord non détecté",
             message="Discord ne semble pas lancé.\n\n"
                     "Tu dois avoir démarré Discord et y être connecté pour utiliser l'application.\n\n"
                     "Lorsque cela sera fait, relance le launcher.",
@@ -72,10 +72,10 @@ 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 stored_user_id != "": # si pas encore d'id dans la config
+    if stored_user_id != "" or not stored_user_id.isspace():
         if not CheckDiscord.isuserconnected(stored_user_id):
             msg = CustomMessageBox(
-                title="Launcher La Tanière: connexion Discord",
+                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.",

src/tools/constants.py

@@ -7,7 +7,6 @@ from PySide6.QtGui import QColor
 # ---------------------------------------------------------------------------
 
 NO_STAFF = True
-NO_DISCORD = True
 
 # ---------------------------------------------------------------------------
 # ENUMS

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'

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)
 
     # ------------------------------------------------------------------

ui/mainwindow_vertical_pager.ui

@@ -640,7 +640,7 @@
              <enum>QFrame::Shape::NoFrame</enum>
             </property>
             <property name="currentIndex">
-             <number>1</number>
+             <number>0</number>
             </property>
             <widget class="QWidget" name="page">
              <property name="minimumSize">