feat: make discord activity only moveable and add finmal build method for build pipeline

- fix settings the activity, before the connect call succeeds, store the last activity and use that to set it, when the connection was established

Author: Totto16

src/discord/core.cpp

@@ -1,7 +1,7 @@
 
-#include "helper/spdlog_wrapper.hpp"
 #include <core/helper/utils.hpp>
 
+#include "../helper/spdlog_wrapper.hpp"
 #include "./core.hpp"
 
 #include <fmt/format.h>
@@ -18,7 +18,8 @@
 
 DiscordInstance::DiscordInstance()
     : m_current_user{ discordpp::UserHandle::nullobj },
-      m_status{ DiscordStatus::Starting } {
+      m_status{ DiscordStatus::Starting },
+      m_current_activity{ std::nullopt } {
 
     m_client.AddLogCallback(
             [](std::string message, discordpp::LoggingSeverity severity) -> void {
@@ -99,7 +100,11 @@ void DiscordInstance::after_ready() {
     );
     if (not result) {
         spdlog::warn("Discord: Failed to Register Launch Command");
-    };
+    }
+
+    if (m_current_activity.has_value()) {
+        set_activity_internal();
+    }
 }
 
 
@@ -143,22 +148,46 @@ void DiscordInstance::update() {
 }
 
 
-void DiscordInstance::set_activity(const DiscordActivityWrapper& activity) {
+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 = activity.get_raw();
+    const auto& raw_activity = m_current_activity.value().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, [](const discordpp::ClientResult& result) {
+    m_client.UpdateRichPresence(raw_activity, [this](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;
     });
 }
 
@@ -167,12 +196,27 @@ void DiscordInstance::clear_activity() {
     m_client.ClearRichPresence();
 }
 
+DiscordActivityWrapper::DiscordActivityWrapper(DiscordActivityWrapper&& old) noexcept
+    : m_activity{ std::move(old.m_activity) } {
+    old.m_activity = discordpp::Activity::nullobj;
+}
+
+
+DiscordActivityWrapper& DiscordActivityWrapper::operator=(DiscordActivityWrapper&& other) noexcept {
+    if (this != &other) {
+
+        m_activity = std::move(other.m_activity);
+
+        other.m_activity = discordpp::Activity::nullobj;
+    }
+    return *this;
+};
 
 DiscordActivityWrapper::DiscordActivityWrapper(const std::string& details, discordpp::ActivityTypes type) {
     // NOTE: this are partial fields, that are set by the final call, do not set them manually
     // https://discord.com/developers/docs/rich-presence/using-with-the-game-sdk#partial-activity-struct
-    // m_activity.SetName(constants::program_name);
-    // m_activity.SetApplicationId(constants::application_id);
+    // m_activity.SetName(constants::program_name.c_str());
+    // m_activity.SetApplicationId(constants::discord::application_id);
 
     m_activity.SetDetails(details);
     m_activity.SetType(type);
@@ -216,6 +260,11 @@ DiscordActivityWrapper& DiscordActivityWrapper::set_details(const std::string& t
 }
 
 
+DiscordActivityWrapper DiscordActivityWrapper::build() {
+
+    return std::move(*this);
+}
+
 [[nodiscard]] const discordpp::Activity& DiscordActivityWrapper::get_raw() const {
     return m_activity;
 }

src/discord/core.hpp

@@ -74,16 +74,26 @@ struct DiscordActivityWrapper {
 public:
     //TODO(Totto):  Add support for party and invites / join / invitations / spectate
 
-    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper(const std::string& details, discordpp::ActivityTypes type);
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED
+    DiscordActivityWrapper(const std::string& details, discordpp::ActivityTypes type);
 
-    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper&
+    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper(DiscordActivityWrapper&& old) noexcept;
+
+    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper& operator=(DiscordActivityWrapper&& other) noexcept;
+
+    DiscordActivityWrapper(DiscordActivityWrapper& old) noexcept = delete;
+
+    DiscordActivityWrapper& operator=(const DiscordActivityWrapper& other) noexcept = delete;
+
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper&
     set_large_image(const std::string& text, constants::discord::ArtAsset asset);
 
-    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper&
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper&
     set_small_image(const std::string& text, constants::discord::ArtAsset asset);
 
-    OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper& set_details(const std::string& text);
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper& set_details(const std::string& text);
 
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED DiscordActivityWrapper build();
 
     template<typename T>
     DiscordActivityWrapper& set_start_timestamp(const std::chrono::time_point<T>& point) {
@@ -126,6 +136,7 @@ struct DiscordInstance {
     discordpp::Client m_client;
     discordpp::UserHandle m_current_user;
     DiscordStatus m_status;
+    std::optional<DiscordActivityWrapper> m_current_activity;
 
 
 public:
@@ -145,9 +156,11 @@ struct DiscordInstance {
 
     OOPETRIS_GRAPHICS_EXPORTED static void update();
 
-    OOPETRIS_GRAPHICS_EXPORTED void set_activity(const DiscordActivityWrapper& activity);
+    OOPETRIS_GRAPHICS_EXPORTED void set_activity(DiscordActivityWrapper activity);
 
 private:
+    void set_activity_internal();
+
     void after_ready();
     void clear_activity();
 };

src/scenes/main_menu/main_menu.cpp

@@ -92,6 +92,7 @@ namespace scenes {
                     DiscordActivityWrapper("Selecting playmode", discordpp::ActivityTypes::Playing)
                             .set_large_image("Playing OOPetris", constants::discord::ArtAsset::Logo)
                             .set_start_timestamp(std::chrono::system_clock::now())
+                            .build()
             );
         }
 

src/scenes/replay_game/replay_game.cpp

@@ -60,6 +60,7 @@ namespace scenes {
                     DiscordActivityWrapper("Replaying a game", discordpp::ActivityTypes::Playing)
                             .set_large_image("Playing OOPetris", constants::discord::ArtAsset::Logo)
                             .set_start_timestamp(std::chrono::system_clock::now())
+                            .build()
             );
         }
 

src/scenes/single_player_game/single_player_game.cpp

@@ -55,6 +55,7 @@ namespace scenes {
                     DiscordActivityWrapper("Playing a single-player game", discordpp::ActivityTypes::Playing)
                             .set_large_image("Playing OOPetris", constants::discord::ArtAsset::Logo)
                             .set_start_timestamp(std::chrono::system_clock::now())
+                            .build()
             );
         }