- Split the single .zip to one for each OS.

- Use global strings for program name, make the latest GitHub release URL a private member.
- Add a new, permanent Discord invite URL for SocialSDK.
- Fix erroneous spaces before angle brackets in a couple of places.

Author: Koi-3088

3rdPartyBinaries/discord_social_sdk.zip

@@ -2464,7 +2464,7 @@ if (WIN32)
     )
 
     file(ARCHIVE_EXTRACT
-      INPUT ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk.zip
+      INPUT ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win.zip
       DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/
     )
 endif()
@@ -2525,10 +2525,10 @@ if (WIN32)
     )
 
     add_library(discord_lib IMPORTED UNKNOWN)
-    target_include_directories(SerialPrograms SYSTEM PRIVATE ../3rdParty/discord_social_sdk/)
+    target_include_directories(SerialPrograms SYSTEM PRIVATE ../3rdParty/discord_social_sdk_win/)
     set_target_properties(discord_lib PROPERTIES
-        IMPORTED_LOCATION_RELEASE   ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk/lib/release/discord_partner_sdk.lib
-        IMPORTED_LOCATION_DEBUG     ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk/lib/debug/discord_partner_sdk.lib)
+        IMPORTED_LOCATION_RELEASE   ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/release/discord_partner_sdk.lib
+        IMPORTED_LOCATION_DEBUG     ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/debug/discord_partner_sdk.lib)
     set_target_properties(discord_lib PROPERTIES
         MAP_IMPORTED_CONFIG_DEBUG           DEBUG
         MAP_IMPORTED_CONFIG_RELEASE         RELEASE
@@ -2803,7 +2803,7 @@ add_custom_command(
     TARGET SerialPrograms
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy
-        $<IF:$<CONFIG:Debug>,"${PROJECT_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk/bin/debug/discord_partner_sdk.dll","${PROJECT_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk/bin/release/discord_partner_sdk.dll">
+        $<IF:$<CONFIG:Debug>,"${PROJECT_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win/bin/debug/discord_partner_sdk.dll","${PROJECT_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win/bin/release/discord_partner_sdk.dll">
         $<TARGET_FILE_DIR:SerialPrograms>/Binaries64/discord_partner_sdk.dll
     COMMENT "Copying Discord SDK DLL to Binaries64"
 )

3rdPartyBinaries/discord_social_sdk_linux.zip

@@ -70,6 +70,9 @@ const std::string DISCORD_LINK_URL_PROGRAM = "https://discord.gg/BSjDp27";
 //  URL to use in the Discord notifications/embeds.
 const std::string DISCORD_LINK_URL_EMBED = "https://discord.gg/xMJcveK";
 
+// URL to use in the DiscordSocialSDK integration.
+const std::string DISCORD_LINK_URL_SDK = "https://discord.gg/gn9YEyjjAV";
+
 
 
 #if 0

3rdPartyBinaries/discord_social_sdk_mac.zip

@@ -31,6 +31,7 @@ extern const std::string GITHUB_LINK_URL;
 extern const std::string DISCORD_LINK_TEXT;
 extern const std::string DISCORD_LINK_URL_PROGRAM;
 extern const std::string DISCORD_LINK_URL_EMBED;
+extern const std::string DISCORD_LINK_URL_SDK;
 
 extern const std::string COMPILER_VERSION;
 

3rdPartyBinaries/discord_social_sdk_win.zip

@@ -6,6 +6,7 @@
 #include "CommonFramework/Logging/Logger.h"
 #include "Integrations/ProgramTracker.h"
 #include "../../CommonFramework/GlobalSettingsPanel.h"
+#include "../../CommonFramework/Globals.h"
 
 using namespace discordpp;
 namespace PokemonAutomation{
@@ -70,10 +71,10 @@ void DiscordSocial::update_rich_presence(){
 
         discordpp::ActivityAssets assets{};
         assets.SetLargeImage("rotom");
-        assets.SetLargeText("Pok\u00E9mon Automation");
+        assets.SetLargeText(PROGRAM_NAME);
 
         for (const auto& item : ProgramTracker::instance().all_programs()){
-            switch (item.second.state) {
+            switch (item.second.state){
                 case ProgramState::RUNNING:{
                     assets.SetSmallImage("running");
                     assets.SetSmallText("Running");
@@ -86,7 +87,7 @@ void DiscordSocial::update_rich_presence(){
                     state = "Stopped";
                     m_activity.SetAssets(assets); break;
                 }
-                default: {
+                default:{
                     assets.SetSmallImage("idle");
                     assets.SetSmallText("Idle");
                     state = "Idle";
@@ -146,17 +147,17 @@ Activity DiscordSocial::create_activity(){
 
     ActivityButton button1{};
     button1.SetLabel("Download from GitHub");
-    button1.SetUrl("https://github.com/PokemonAutomation/ComputerControl/releases/latest");
+    button1.SetUrl(m_github_release_latest);
     activity.AddButton(button1);
 
     ActivityButton button2{};
     button2.SetLabel("Join our Discord");
-    button2.SetUrl("https://discord.gg/pokemonautomation");
+    button2.SetUrl(DISCORD_LINK_URL_SDK);
     activity.AddButton(button2);
 
     discordpp::ActivityAssets assets{};
     assets.SetLargeImage("rotom");
-    assets.SetLargeText("Pok\u00E9mon Automation");
+    assets.SetLargeText(PROGRAM_NAME);
     assets.SetSmallImage("idle");
     assets.SetSmallText("Idle");
     activity.Assets().emplace(assets);

SerialPrograms/CMakeLists.txt

@@ -34,6 +34,7 @@ namespace DiscordSocialSDK{
             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";
     };
 }
 }