Implement Discord Social SDK #676
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| #ifdef PA_SOCIAL_SDK | ||
| #define DISCORDPP_IMPLEMENTATION | ||
|
|
||
| #include <thread> | ||
| #include "DiscordSocial.h" | ||
| #include "CommonFramework/Logging/Logger.h" | ||
| #include "Integrations/ProgramTracker.h" | ||
| #include "../../CommonFramework/GlobalSettingsPanel.h" | ||
| #include "../../CommonFramework/Globals.h" | ||
|
|
||
| using namespace discordpp; | ||
| namespace PokemonAutomation{ | ||
| namespace Integration{ | ||
| namespace DiscordSocialSDK{ | ||
|
|
||
| DiscordSocial& DiscordSocial::instance(){ | ||
| static DiscordSocial instance; | ||
| return instance; | ||
| } | ||
|
|
||
| void DiscordSocial::run(){ | ||
| auto client = std::make_shared<Client>(); | ||
| if (!client){ | ||
| log("Failed to initialize DiscordSocialSDK.", "run()", LoggingSeverity::Error); | ||
| return; | ||
| } | ||
|
|
||
| m_client = std::move(client); | ||
| try{ | ||
| m_client->SetApplicationId(m_app_id); | ||
| m_client->AddLogCallback([&](auto message, auto severity){ | ||
| log(message, "Internal", severity); | ||
| }, m_log_level); | ||
|
|
||
| m_thread = std::thread(&DiscordSocial::thread_loop, this); | ||
| }catch (...){ | ||
| m_client.reset(); | ||
| log("Failed to start DiscordSocialSDK.", "run()", LoggingSeverity::Error); | ||
| throw; | ||
| } | ||
| } | ||
|
|
||
| void DiscordSocial::thread_loop(){ | ||
| log("Starting Discord Rich Presence update thread...", "thread_loop()", LoggingSeverity::Info); | ||
| m_running.store(true, std::memory_order_release); | ||
| m_activity = create_activity(); | ||
| m_client->UpdateRichPresence(m_activity, [&](ClientResult result){ | ||
| if (!result.Successful()){ | ||
| log("Rich Presence initial update failed.", "thread_loop()", LoggingSeverity::Warning); | ||
| } | ||
| }); | ||
|
|
||
| while (m_running.load(std::memory_order_relaxed)){ | ||
| try{ | ||
| if (!m_running.load(std::memory_order_relaxed) || !GlobalSettings::instance().RICH_PRESENCE){ | ||
| break; | ||
| } | ||
|
|
||
| RunCallbacks(); | ||
| update_rich_presence(); | ||
| std::this_thread::sleep_for(std::chrono::seconds(1)); | ||
| }catch (const std::exception& e){ | ||
| log("Exception: " + std::string(e.what()), "thread_loop()", LoggingSeverity::Error); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| m_running.store(false, std::memory_order_release); | ||
| m_client.reset(); | ||
| log("Discord Rich Presence update thread exiting...", "thread_loop()", LoggingSeverity::Info); | ||
| } | ||
|
|
||
| void DiscordSocial::update_rich_presence(){ | ||
| try{ | ||
| std::string details = m_activity.Details().value(); | ||
| std::string state = m_activity.State().value(); | ||
|
|
||
| discordpp::ActivityAssets assets{}; | ||
| assets.SetLargeImage("rotom"); | ||
| assets.SetLargeText(PROGRAM_NAME); | ||
|
|
||
| for (const auto& item : ProgramTracker::instance().all_programs()){ | ||
| switch (item.second.state){ | ||
| case ProgramState::RUNNING:{ | ||
| assets.SetSmallImage("running"); | ||
| assets.SetSmallText("Running"); | ||
| state = "Running"; | ||
| m_activity.SetAssets(assets); break; | ||
| } | ||
| case ProgramState::STOPPED:{ | ||
| assets.SetSmallImage("stopped"); | ||
| assets.SetSmallText("Stopped"); | ||
| state = "Stopped"; | ||
| m_activity.SetAssets(assets); break; | ||
| } | ||
| default:{ | ||
| assets.SetSmallImage("idle"); | ||
| assets.SetSmallText("Idle"); | ||
| state = "Idle"; | ||
| m_activity.SetAssets(assets); break; | ||
| } | ||
| } | ||
|
|
||
| if (item.second.program_name != details){ | ||
| details = item.second.program_name; | ||
| } | ||
|
|
||
| m_timestamps.SetStart(std::chrono::duration_cast<std::chrono::seconds>(item.second.start_time.time_since_epoch()).count()); | ||
| } | ||
|
|
||
| m_activity.SetTimestamps(m_timestamps); | ||
| m_activity.SetDetails(details); | ||
| m_activity.SetState(state); | ||
| m_client->UpdateRichPresence(m_activity, [&](ClientResult result){ | ||
| if (!result.Successful()){ | ||
| log("Rich Presence update failed.", "update_rp()", LoggingSeverity::Warning); | ||
| } | ||
| }); | ||
| }catch (const std::exception& e){ | ||
| m_running.store(false, std::memory_order_release); | ||
| log("Exception: " + std::string(e.what()), "update_rp()", LoggingSeverity::Error); | ||
| } | ||
| } | ||
|
|
||
| Logger& DiscordSocial::logger(){ | ||
| static TaggedLogger logger(global_logger_raw(), "DiscordSocialSDK"); | ||
| return logger; | ||
| } | ||
|
|
||
| void DiscordSocial::log(const std::string& message, const std::string& identity, const LoggingSeverity& severity){ | ||
| if (severity < m_log_level){ | ||
| return; | ||
| } | ||
|
|
||
| std::string log = identity + ": " + message; | ||
| Color color; | ||
| switch (severity){ | ||
| case LoggingSeverity::Verbose: color = COLOR_GRAY; break; | ||
| case LoggingSeverity::Info: color = COLOR_CYAN; break; | ||
| case LoggingSeverity::Warning: color = COLOR_ORANGE; break; | ||
| case LoggingSeverity::Error: color = COLOR_MAGENTA; break; | ||
| default: color = COLOR_PURPLE; break; | ||
| }; | ||
|
|
||
| logger().log(log, color); | ||
| } | ||
|
|
||
| Activity DiscordSocial::create_activity(){ | ||
| Activity activity{}; | ||
| activity.SetType(ActivityTypes::Playing); | ||
| activity.SetDetails("ComputerControl: Preparing to automate..."); | ||
| activity.SetState("Idle"); | ||
|
|
||
| ActivityButton button1{}; | ||
| button1.SetLabel("Download from GitHub"); | ||
| button1.SetUrl(m_github_release_latest); | ||
| activity.AddButton(button1); | ||
|
|
||
| ActivityButton button2{}; | ||
| button2.SetLabel("Join our Discord"); | ||
| button2.SetUrl(DISCORD_LINK_URL_SDK); | ||
| activity.AddButton(button2); | ||
|
|
||
| discordpp::ActivityAssets assets{}; | ||
| assets.SetLargeImage("rotom"); | ||
| assets.SetLargeText(PROGRAM_NAME); | ||
| assets.SetSmallImage("idle"); | ||
| assets.SetSmallText("Idle"); | ||
| activity.Assets().emplace(assets); | ||
| return activity; | ||
| } | ||
|
|
||
|
|
||
| } | ||
| } | ||
| } | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #pragma once | ||
| #ifndef DISCORD_SOCIAL_H | ||
| #define DISCORD_SOCIAL_H | ||
|
|
||
| #include <thread> | ||
| #include <atomic> | ||
| #include <discord_social_sdk/discordpp.h> | ||
| #include "Common/Cpp/AbstractLogger.h" | ||
|
|
||
| namespace PokemonAutomation{ | ||
| namespace Integration{ | ||
| namespace DiscordSocialSDK{ | ||
| class DiscordSocial{ | ||
| public: | ||
| DiscordSocial() : m_running(false) {} | ||
| ~DiscordSocial(){ | ||
| m_running.store(false, std::memory_order_release); | ||
| m_thread.join(); | ||
| if (m_client) m_client.reset(); | ||
| } | ||
|
|
||
| static DiscordSocial& instance(); | ||
| void run(); | ||
|
|
||
| private: | ||
| Logger& logger(); | ||
| void log(const std::string& message, const std::string& identity, const discordpp::LoggingSeverity& severity); | ||
| discordpp::Activity create_activity(); | ||
| void update_rich_presence(); | ||
| void thread_loop(); | ||
|
|
||
| private: | ||
| std::thread m_thread; | ||
| std::shared_ptr<discordpp::Client> m_client = nullptr; | ||
| std::atomic<bool> m_running; | ||
| const uint64_t m_app_id = 1406867596585865326; | ||
|
Collaborator
There was a problem hiding this comment. Is this intentionally hard-coded? Where does it come from?
Member
Author
There was a problem hiding this comment.
|
||
| discordpp::Activity m_activity; | ||
| discordpp::ActivityTimestamps m_timestamps{}; | ||
| discordpp::LoggingSeverity m_log_level = discordpp::LoggingSeverity::Error; | ||
| const std::string m_github_release_latest = "https://github.com/PokemonAutomation/ComputerControl/releases/latest"; | ||
| }; | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to do this every second? Is it possible to diff to see if anything changed. And only update if something changed?
Ideally CC itself should push these changes out, but now is not the time to re-architect that part so this is fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DiscordSDK requires some sort of a main loop that calls
RunCallbacks()regularly for internal logging and other set callbacks. 1 second with logging only set to errors won't spam, but a loop running on status change (which is possible) would be more invasive (likely require OAuth2 or additional scopes: currently there are none).If we want CC to dictate rich presence update, that would require a direct program state reference (or something thereof). Not sure how feasible when initialized from
Main.cpp.