fix: correctly handle discord connection

- that is remove the Connect call and the status, all needed functionality can be called, without connecting to the gateway, the ipc connection is done implicitly on creation

Author: Totto16

src/discord/core.cpp

@@ -16,10 +16,10 @@
     }
 }
 
-DiscordInstance::DiscordInstance()
-    : m_current_user{ discordpp::UserHandle::nullobj },
-      m_status{ DiscordStatus::Starting },
-      m_current_activity{ std::nullopt } {
+
+DiscordInstance::DiscordInstance() : m_current_user{ discordpp::UserHandle::nullobj } {
+
+    m_client.SetApplicationId(constants::discord::application_id);
 
     m_client.AddLogCallback(
             [](std::string message, discordpp::LoggingSeverity severity) -> void {
@@ -47,28 +47,7 @@ DiscordInstance::DiscordInstance()
 #endif
     );
 
-
-    m_client.SetStatusChangedCallback(
-            [this](discordpp::Client::Status status, discordpp::Client::Error error, int32_t error_detail) -> void {
-                if (error != discordpp::Client::Error::None) {
-                    this->m_status = DiscordStatus::Error;
-                    spdlog::error(
-                            "Connection Error: {} - Details: {}", discordpp::Client::ErrorToString(error), error_detail
-                    );
-                    return;
-                }
-
-                if (status == discordpp::Client::Status::Ready) {
-                    this->m_status = DiscordStatus::Ok;
-                    this->after_ready();
-                    return;
-                }
-            }
-    );
-
-    m_client.SetApplicationId(constants::discord::application_id);
-
-    m_client.Connect();
+    after_ready();
 }
 
 void DiscordInstance::after_ready() {
@@ -78,15 +57,8 @@ void DiscordInstance::after_ready() {
             [this](const discordpp::ClientResult& result, std::optional<discordpp::UserHandle> user) -> void {
                 if (result.Successful() and user.has_value()) {
 
-                    auto user_handle = m_client.GetUser(user->Id());
-                    if (not user_handle.has_value()) {
-                        spdlog::error("Current Connected User Error: Can't get userhandle from id: {}", user->Id());
-
-                        return;
-                    }
-
-                    this->m_current_user = user_handle.value();
-                    spdlog::info("Current user updated: {}", user_handle->Username());
+                    this->m_current_user = user.value();
+                    spdlog::info("Current user updated: {}", user->Username());
 
                     return;
                 }
@@ -101,20 +73,14 @@ void DiscordInstance::after_ready() {
     if (not result) {
         spdlog::warn("Discord: Failed to Register Launch Command");
     }
-
-    if (m_current_activity.has_value()) {
-        set_activity_internal();
-    }
 }
 
 
 DiscordInstance::DiscordInstance(DiscordInstance&& old) noexcept
     : m_client{ std::move(old.m_client) },
-      m_current_user{ std::move(old.m_current_user) },
-      m_status{ old.m_status } {
+      m_current_user{ std::move(old.m_current_user) } {
     old.m_client = discordpp::Client{};
     old.m_current_user = discordpp::UserHandle::nullobj;
-    old.m_status = DiscordStatus::Error;
 }
 
 
@@ -123,71 +89,41 @@ DiscordInstance& DiscordInstance::operator=(DiscordInstance&& other) noexcept {
 
         m_client = std::move(other.m_client);
         m_current_user = std::move(other.m_current_user);
-        m_status = other.m_status;
 
         other.m_client = discordpp::Client{};
         other.m_current_user = discordpp::UserHandle::nullobj;
-        other.m_status = DiscordStatus::Error;
     }
     return *this;
 };
 
 DiscordInstance::~DiscordInstance() {
     if (m_client.operator bool()) {
         clear_activity();
-        m_client.Disconnect();
     }
 }
 
-[[nodiscard]] DiscordStatus DiscordInstance::get_status() {
-    return m_status;
-}
-
 void DiscordInstance::update() {
     discordpp::RunCallbacks();
 }
 
 
 void DiscordInstance::set_activity(DiscordActivityWrapper activity) {
 
-    if (m_status == DiscordStatus::Error) {
-        // don't set activity
-        return;
-    }
 
-    m_current_activity = std::move(activity);
-
-    if (m_status == DiscordStatus::Starting) {
-        // return after we stored the current activity, the after_ready callback will set the activity
-        return;
-    }
-
-    set_activity_internal();
-}
-
-void DiscordInstance::set_activity_internal() {
-
-    if (not m_current_activity.has_value()) {
-        return;
-    }
-
-
-    const auto& raw_activity = m_current_activity.value().get_raw();
+    const auto& raw_activity = activity.get_raw();
 
     if (not raw_activity.operator bool()) {
         spdlog::error("Tried to set an invalid Discord Activity!");
         return;
     }
 
     // Update rich presence
-    m_client.UpdateRichPresence(raw_activity, [this](const discordpp::ClientResult& result) {
+    m_client.UpdateRichPresence(raw_activity, [](const discordpp::ClientResult& result) {
         if (result.Successful()) {
             spdlog::info("Rich Presence updated successfully");
         } else {
             spdlog::error("Rich Presence update failed: {}", result.ToString());
         }
-
-        this->m_current_activity = std::nullopt;
     });
 }
 

src/discord/core.hpp

@@ -129,21 +129,14 @@ struct DiscordActivityWrapper {
     [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED const discordpp::Activity& get_raw() const;
 };
 
-enum class DiscordStatus : u8 { Starting = 0, Ok, Error };
-
 struct DiscordInstance {
 private:
     discordpp::Client m_client;
     discordpp::UserHandle m_current_user;
-    DiscordStatus m_status;
-    std::optional<DiscordActivityWrapper> m_current_activity;
-
 
 public:
     OOPETRIS_GRAPHICS_EXPORTED explicit DiscordInstance();
 
-    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED DiscordStatus get_status();
-
     OOPETRIS_GRAPHICS_EXPORTED DiscordInstance(DiscordInstance&& old) noexcept;
 
     OOPETRIS_GRAPHICS_EXPORTED DiscordInstance& operator=(DiscordInstance&& other) noexcept;
@@ -159,8 +152,6 @@ struct DiscordInstance {
     OOPETRIS_GRAPHICS_EXPORTED void set_activity(DiscordActivityWrapper activity);
 
 private:
-    void set_activity_internal();
-
     void after_ready();
     void clear_activity();
 };

src/executables/game/application.cpp

@@ -202,10 +202,11 @@ void Application::run() {
     return;
 #else
 
-    while (m_is_running
+    while (
+            m_is_running
 
 #if defined(__CONSOLE__)
-           and console::inMainLoop()
+            and console::inMainLoop()
 #endif
 
     ) {
@@ -383,7 +384,8 @@ void Application::update() {
                                 },
                                 [this](const scenes::Scene::Push& push) {
                                     spdlog::info("pushing back scene {}", magic_enum::enum_name(push.target_scene));
-                                    m_scene_stack.push_back(scenes::create_scene(*this, push.target_scene, push.layout)
+                                    m_scene_stack.push_back(
+                                            scenes::create_scene(*this, push.target_scene, push.layout)
                                     );
                                 },
                                 [this](scenes::Scene::RawPush& raw_push) {
@@ -432,17 +434,7 @@ void Application::update() {
 #if defined(_HAVE_DISCORD_SOCIAL_SDK)
 
     if (m_discord_instance.has_value()) {
-
-        switch (m_discord_instance->get_status()) {
-            case DiscordStatus::Error:
-                m_discord_instance = std::nullopt;
-                spdlog::warn("Error initializing the discord instance, it might not be running, destroying client!");
-                break;
-            case DiscordStatus::Starting:
-            case DiscordStatus::Ok:
-                DiscordInstance::update();
-                break;
-        }
+        DiscordInstance::update();
     }
 
 #endif
@@ -542,9 +534,10 @@ void Application::initialize() {
     emscripten_set_main_loop_arg(c_loop_entry, this, selected_fps, true);
     UNREACHABLE();
 #else
-    while ((not m_loading_info->m_finished_loading) and m_is_running
+    while (
+            (not m_loading_info->m_finished_loading) and m_is_running
 #if defined(__CONSOLE__)
-           and console::inMainLoop()
+            and console::inMainLoop()
 #endif
     ) {
         load_loop();