Branchement de discord oauth
This commit is contained in:
23
src/main.py
23
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)
|
# On récupère l'ID stocké (sera "" si absent grâce au schéma)
|
||||||
stored_user_id = config.get_discord_user()
|
stored_user_id = config.get_discord_user()
|
||||||
if not CheckDiscord.isuserconnected():
|
if stored_user_id != "" or not stored_user_id.isspace():
|
||||||
msg = CustomMessageBox(
|
if not CheckDiscord.isuserconnected(stored_user_id):
|
||||||
title="La Tanière: connexion Discord",
|
msg = CustomMessageBox(
|
||||||
message="Tu n'est pas connecté à Discord\n\n"
|
title="La Tanière: connexion Discord",
|
||||||
"Assure-toi que tu es connecté à Discord.\n\n"
|
message="Tu n'est pas connecté à Discord\n\n"
|
||||||
"Lorsque cela sera fait, relance le launcher.",
|
"Assure-toi que tu es connecté à Discord.\n\n"
|
||||||
icon_type=CustomMessageBox.WARNING,
|
"Lorsque cela sera fait, relance le launcher.",
|
||||||
buttons=CustomMessageBox.OK
|
icon_type=CustomMessageBox.WARNING,
|
||||||
)
|
buttons=CustomMessageBox.OK
|
||||||
msg.exec()
|
)
|
||||||
sys.exit(0) # On quitte proprement sans lancer MainWindow
|
msg.exec()
|
||||||
|
sys.exit(0) # On quitte proprement sans lancer MainWindow
|
||||||
|
|
||||||
# 4. Lancement de l'application si tout est OK
|
# 4. Lancement de l'application si tout est OK
|
||||||
window = MainWindow(bundle_dir, config)
|
window = MainWindow(bundle_dir, config)
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ from PySide6.QtGui import QColor
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
NO_STAFF = True
|
NO_STAFF = True
|
||||||
NO_DISCORD = True
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# ENUMS
|
# ENUMS
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import webbrowser
|
|||||||
import os
|
import os
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from http.server import HTTPServer, BaseHTTPRequestHandler
|
from http.server import HTTPServer, BaseHTTPRequestHandler
|
||||||
from get_server_token import GetServerTokenForDiscord
|
from tools.get_server_token import GetServerTokenForDiscord
|
||||||
|
|
||||||
# Disable stderr output
|
# Disable stderr output
|
||||||
os.environ['PYTHONWARNINGS'] = 'ignore'
|
os.environ['PYTHONWARNINGS'] = 'ignore'
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ from config.config_manager import ConfigManager
|
|||||||
from controllers.audio_controller import AudioController
|
from controllers.audio_controller import AudioController
|
||||||
from controllers.glow_animator import GlowAnimator
|
from controllers.glow_animator import GlowAnimator
|
||||||
from controllers.window_dragger import WindowDragger
|
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
|
from fake_patch_notes import patch_note
|
||||||
|
|
||||||
# For Linux Wayland to authorize moving window
|
# For Linux Wayland to authorize moving window
|
||||||
@@ -43,7 +45,7 @@ class MainWindow(QMainWindow):
|
|||||||
break
|
break
|
||||||
# self.ui.spacer_substitution.hide()
|
# 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_lbl.hide()
|
||||||
self.ui.queue_position.hide()
|
self.ui.queue_position.hide()
|
||||||
self.ui.stackedWidget.setCurrentIndex(1)
|
self.ui.stackedWidget.setCurrentIndex(1)
|
||||||
@@ -98,6 +100,8 @@ class MainWindow(QMainWindow):
|
|||||||
self._glow.start()
|
self._glow.start()
|
||||||
|
|
||||||
def _on_discord_auth_btn(self) -> None:
|
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)
|
self.ui.stackedWidget.setCurrentIndex(0)
|
||||||
|
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
|
|||||||
@@ -640,7 +640,7 @@
|
|||||||
<enum>QFrame::Shape::NoFrame</enum>
|
<enum>QFrame::Shape::NoFrame</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="page">
|
<widget class="QWidget" name="page">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
|
|||||||
Reference in New Issue
Block a user