- set activity on core scenes, alias on scenes, where we do something that needs updating of the RP

- add support for setting start and end timestamps on discord activities

Author: Totto16

src/application.cpp

@@ -3,8 +3,8 @@
 #include "helper/sleep.hpp"
 #include "platform/capabilities.hpp"
 #include "scenes/scene.hpp"
-#include "types.h"
 
+#include <chrono>
 #include <ranges>
 
 #if defined(__SWITCH__)
@@ -50,25 +50,6 @@ void Application::run() {
     const double count_per_s = static_cast<double>(SDL_GetPerformanceFrequency());
     u64 frame_counter = 0;
 #endif
-
-
-#if defined(_HAVE_DISCORD_SDK)
-    auto discord_instance = DiscordInstance::initialize();
-    if (not discord_instance.has_value()) {
-        spdlog::warn("Error initializing the discord instance, it might not be running: {}", discord_instance.error());
-    } else {
-        m_discord_instance = std::move(discord_instance.value());
-        m_discord_instance->after_setup();
-
-        m_discord_instance->set_activity(
-                DiscordActivityWrapper("Selecting playmode", discord::ActivityType::Playing)
-                        .add_large_image("Playing OOPetris", constants::discord::ArtAsset::logo)
-        );
-    }
-
-#endif
-
-
     using namespace std::chrono_literals;
 
     const auto sleep_time = m_target_framerate.has_value() ? std::chrono::duration_cast<std::chrono::nanoseconds>(1s)
@@ -240,6 +221,18 @@ void Application::render() const {
 }
 
 void Application::initialize() {
+
+#if defined(_HAVE_DISCORD_SDK)
+    auto discord_instance = DiscordInstance::initialize();
+    if (not discord_instance.has_value()) {
+        spdlog::warn("Error initializing the discord instance, it might not be running: {}", discord_instance.error());
+    } else {
+        m_discord_instance = std::move(discord_instance.value());
+        m_discord_instance->after_setup();
+    }
+
+#endif
+
     try_load_settings();
     load_resources();
     push_scene(scenes::create_scene(*this, SceneId::MainMenu, ui::FullScreenLayout{ m_window }));

src/discord/core.cpp

@@ -153,7 +153,7 @@ DiscordActivityWrapper::DiscordActivityWrapper(const std::string& details, disco
 
 
 DiscordActivityWrapper&
-DiscordActivityWrapper::add_large_image(const std::string& text, constants::discord::ArtAsset asset) {
+DiscordActivityWrapper::set_large_image(const std::string& text, constants::discord::ArtAsset asset) {
     m_activity.GetAssets().SetLargeText(text.c_str());
 
     const auto asset_key = constants::discord::get_asset_key(asset);
@@ -164,7 +164,7 @@ DiscordActivityWrapper::add_large_image(const std::string& text, constants::disc
 
 
 DiscordActivityWrapper&
-DiscordActivityWrapper::add_small_image(const std::string& text, constants::discord::ArtAsset asset) {
+DiscordActivityWrapper::set_small_image(const std::string& text, constants::discord::ArtAsset asset) {
     m_activity.GetAssets().SetSmallText(text.c_str());
 
     const auto asset_key = constants::discord::get_asset_key(asset);

src/discord/core.hpp

@@ -4,6 +4,7 @@
 
 #include "helper/expected.hpp"
 
+#include <chrono>
 #include <discord.h>
 #include <memory>
 #include <string>
@@ -46,10 +47,35 @@ struct DiscordActivityWrapper {
 
     DiscordActivityWrapper(const std::string& details, discord::ActivityType type);
 
-    DiscordActivityWrapper& add_large_image(const std::string& text, constants::discord::ArtAsset asset);
-    DiscordActivityWrapper& add_small_image(const std::string& text, constants::discord::ArtAsset asset);
+    DiscordActivityWrapper& set_large_image(const std::string& text, constants::discord::ArtAsset asset);
+    DiscordActivityWrapper& set_small_image(const std::string& text, constants::discord::ArtAsset asset);
     DiscordActivityWrapper& set_details(const std::string& text);
 
+    template<typename T>
+    DiscordActivityWrapper& set_start_timestamp(const std::chrono::time_point<T>& point) {
+
+        const auto seconds_since_epoch = static_cast<discord::Timestamp>(
+                std::chrono::duration_cast<std::chrono::seconds>(point.time_since_epoch()).count()
+        );
+
+        m_activity.GetTimestamps().SetStart(seconds_since_epoch);
+
+        return *this;
+    }
+
+    template<typename T>
+    DiscordActivityWrapper& set_end_timestamp(const std::chrono::time_point<T>& point) {
+
+        const auto seconds_since_epoch = static_cast<discord::Timestamp>(
+                std::chrono::duration_cast<std::chrono::seconds>(point.time_since_epoch()).count()
+        );
+
+        m_activity.GetTimestamps().SetEnd(seconds_since_epoch);
+
+        return *this;
+    }
+
+
     [[nodiscard]] const discord::Activity& get_raw() const;
 };
 

src/manager/service_provider.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(_HAVE_DISCORD_SDK) && ! defined(_OOPETRIS_RECORDING_UTILITY)
+#if defined(_HAVE_DISCORD_SDK) && !defined(_OOPETRIS_RECORDING_UTILITY)
 
 #include "discord/core.hpp"
 #include "helper/optional.hpp"

src/scenes/main_menu/main_menu.cpp

@@ -81,6 +81,20 @@ namespace scenes {
                 button_size, button_alignment, button_margins
         );
 
+
+#if defined(_HAVE_DISCORD_SDK)
+        if (auto& discord_instance = service_provider->discord_instance(); discord_instance.has_value()) {
+
+            discord_instance->set_activity(
+                    DiscordActivityWrapper("Selecting playmode", discord::ActivityType::Playing)
+                            .set_large_image("Playing OOPetris", constants::discord::ArtAsset::logo)
+                            .set_start_timestamp(std::chrono::system_clock::now())
+            );
+        }
+
+#endif
+
+
         service_provider->music_manager()
                 .load_and_play_music(
                         utils::get_assets_folder() / "music" / utils::get_supported_music_extension("01. Main Menu")

src/scenes/replay_game/replay_game.cpp

@@ -42,6 +42,19 @@ namespace scenes {
         }
 
 
+#if defined(_HAVE_DISCORD_SDK)
+        if (auto& discord_instance = service_provider->discord_instance(); discord_instance.has_value()) {
+
+            discord_instance->set_activity(
+                    DiscordActivityWrapper("Replaying a game", discord::ActivityType::Playing)
+                            .set_large_image("Playing OOPetris", constants::discord::ArtAsset::logo)
+                            .set_start_timestamp(std::chrono::system_clock::now())
+            );
+        }
+
+#endif
+
+
         m_service_provider->music_manager()
                 .load_and_play_music(
                         utils::get_assets_folder() / "music" / utils::get_supported_music_extension("02. Game Theme")

src/scenes/single_player_game/single_player_game.cpp

@@ -22,6 +22,20 @@ namespace scenes {
 
         m_game = std::make_unique<Game>(service_provider, std::move(input), starting_parameters, layout, true);
 
+
+#if defined(_HAVE_DISCORD_SDK)
+        if (auto& discord_instance = service_provider->discord_instance(); discord_instance.has_value()) {
+
+            discord_instance->set_activity(
+                    DiscordActivityWrapper("Playing a single-player game", discord::ActivityType::Playing)
+                            .set_large_image("Playing OOPetris", constants::discord::ArtAsset::logo)
+                            .set_start_timestamp(std::chrono::system_clock::now())
+            );
+        }
+
+#endif
+
+
         m_service_provider->music_manager()
                 .load_and_play_music(
                         utils::get_assets_folder() / "music" / utils::get_supported_music_extension("02. Game Theme")