-
-
Notifications
You must be signed in to change notification settings - Fork 451
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Discord Rich Presence support (#3167)
* get draft from #2577 * get draft from #2577 * add checkbox to allow connecting with discord-rpc test case with load data * safe delete only if used * fix vars when game is launching * add function to set appid and small fixes * added functions to manage assets, small fixes and bugs * rewriten setAsset, refactor littlebit * add function to check client connection with discord * add buttons to rpc * minor amendments, renaming of functions * remove update discord-rpc from build * thats too * Memory leak fixed, presence updated on app change * Presence state change, change of time variable * Fixed unable to change custom state * Added const to IsDiscordRPCEnabled * Added missing argument validation * Exclude vendor files, added premake script * Re-run actions * Bump discord-rpc version * Fix broken discord tag_name * Bump discord-rpc version * Revert to 2b42cd9 * Bump discord-rpc version * Disabled data customization if the app is not own * Change DEFAULT_APP_ID * Remove comment --------- Co-authored-by: Lpsd <[email protected]>
- Loading branch information
Showing
21 changed files
with
958 additions
and
41 deletions.
There are no files selected for viewing
This file contains 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 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 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 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,227 @@ | ||
| /***************************************************************************** | ||
| * | ||
| * PROJECT: Multi Theft Auto v1.0 | ||
| * LICENSE: See LICENSE in the top level directory | ||
| * FILE: core/CDiscordRichPresence.cpp | ||
| * PURPOSE: Discord rich presence implementation | ||
| * | ||
| * Multi Theft Auto is available from http://www.multitheftauto.com/ | ||
| * | ||
| *****************************************************************************/ | ||
|
|
||
| #include "StdInc.h" | ||
| #include "discord_rpc.h" | ||
| #include "CDiscordRichPresence.h" | ||
|
|
||
| constexpr char DEFAULT_APP_ID[] = "468493322583801867"; | ||
| constexpr char DEFAULT_APP_ASSET[] = "mta_logo_round"; | ||
| constexpr char DEFAULT_APP_ASSET_TEXT[] = "Multi Theft Auto"; | ||
| constexpr char DEFAULT_APP_ASSET_SMALL[] = ""; | ||
| constexpr char DEFAULT_APP_ASSET_SMALL_TEXT[] = ""; | ||
|
|
||
| CDiscordRichPresence::CDiscordRichPresence() : m_uiDiscordAppStart(0), m_uiDiscordAppEnd(0) | ||
| { | ||
| SetDefaultData(); | ||
|
|
||
| m_strDiscordAppState.clear(); | ||
| } | ||
|
|
||
| CDiscordRichPresence::~CDiscordRichPresence() | ||
| { | ||
| if (m_bDiscordRPCEnabled) | ||
| ShutdownDiscord(); | ||
| } | ||
|
|
||
| void CDiscordRichPresence::InitializeDiscord() | ||
| { | ||
| DiscordEventHandlers handlers; | ||
| memset(&handlers, 0, sizeof(handlers)); | ||
|
|
||
| // Handlers .ready .disconnected .errored maybe use in future? | ||
| Discord_Initialize((m_strDiscordAppCurrentId.empty()) ? DEFAULT_APP_ID : m_strDiscordAppCurrentId.c_str(), &handlers, 1, nullptr); | ||
|
|
||
| m_bDisallowCustomDetails = (m_strDiscordAppCurrentId == DEFAULT_APP_ID) ? true : false; | ||
| } | ||
|
|
||
| void CDiscordRichPresence::ShutdownDiscord() | ||
| { | ||
| Discord_Shutdown(); | ||
| } | ||
|
|
||
| void CDiscordRichPresence::RestartDiscord() | ||
| { | ||
| ShutdownDiscord(); | ||
| InitializeDiscord(); | ||
| } | ||
|
|
||
| void CDiscordRichPresence::SetDefaultData() | ||
| { | ||
| m_strDiscordAppId = DEFAULT_APP_ID; | ||
| m_strDiscordAppAsset = DEFAULT_APP_ASSET; | ||
| m_strDiscordAppAssetText = DEFAULT_APP_ASSET_TEXT; | ||
|
|
||
| m_strDiscordAppAssetSmall = DEFAULT_APP_ASSET_SMALL; | ||
| m_strDiscordAppAssetSmallText = DEFAULT_APP_ASSET_SMALL_TEXT; | ||
|
|
||
| m_strDiscordAppCurrentId = DEFAULT_APP_ID; | ||
| m_strDiscordAppDetails.clear(); | ||
| m_strDiscordAppCustomState.clear(); | ||
|
|
||
| m_aButtons = {}; | ||
| m_bUpdateRichPresence = true; | ||
| m_bDisallowCustomDetails = true; | ||
| } | ||
|
|
||
| void CDiscordRichPresence::UpdatePresence() | ||
| { | ||
| if (!m_bUpdateRichPresence) | ||
| return; | ||
|
|
||
| DiscordRichPresence discordPresence; | ||
| memset(&discordPresence, 0, sizeof(discordPresence)); | ||
|
|
||
| discordPresence.largeImageKey = m_strDiscordAppAsset.c_str(); | ||
| discordPresence.largeImageText = m_strDiscordAppAssetText.c_str(); | ||
| discordPresence.smallImageKey = m_strDiscordAppAssetSmall.c_str(); | ||
| discordPresence.smallImageText = m_strDiscordAppAssetSmallText.c_str(); | ||
|
|
||
| discordPresence.state = (!m_strDiscordAppCustomState.empty() || !m_bDisallowCustomDetails) ? m_strDiscordAppCustomState.c_str() : m_strDiscordAppState.c_str(); | ||
|
|
||
| discordPresence.details = m_strDiscordAppDetails.c_str(); | ||
| discordPresence.startTimestamp = m_uiDiscordAppStart; | ||
|
|
||
| DiscordButton buttons[2]; | ||
| if (m_aButtons) | ||
| { | ||
| buttons[0].label = std::get<0>(*m_aButtons).first.c_str(); | ||
| buttons[0].url = std::get<0>(*m_aButtons).second.c_str(); | ||
| buttons[1].label = std::get<1>(*m_aButtons).first.c_str(); | ||
| buttons[1].url = std::get<1>(*m_aButtons).second.c_str(); | ||
|
|
||
| discordPresence.buttons = buttons; | ||
| } | ||
|
|
||
| Discord_UpdatePresence(&discordPresence); | ||
| m_bUpdateRichPresence = false; | ||
| } | ||
|
|
||
| void CDiscordRichPresence::SetPresenceStartTimestamp(const unsigned long ulStart) | ||
| { | ||
| m_uiDiscordAppStart = ulStart; | ||
| m_bUpdateRichPresence = true; | ||
| } | ||
|
|
||
| void CDiscordRichPresence::SetAssetLargeData(const char* szAsset, const char* szAssetText) | ||
| { | ||
| SetAsset(szAsset, szAssetText, true); | ||
| } | ||
|
|
||
| void CDiscordRichPresence::SetAssetSmallData(const char* szAsset, const char* szAssetText) | ||
| { | ||
| SetAsset(szAsset, szAssetText, false); | ||
| } | ||
|
|
||
| void CDiscordRichPresence::SetAsset(const char* szAsset, const char* szAssetText, bool isLarge) | ||
| { | ||
| if (isLarge) | ||
| { | ||
| m_strDiscordAppAsset = (szAsset && *szAsset) ? szAsset : DEFAULT_APP_ASSET; | ||
| m_strDiscordAppAssetText = (szAssetText && *szAssetText) ? szAssetText : DEFAULT_APP_ASSET_TEXT; | ||
| } | ||
| else | ||
| { | ||
| m_strDiscordAppAssetSmall = (szAsset && *szAsset) ? szAsset : DEFAULT_APP_ASSET_SMALL; | ||
| m_strDiscordAppAssetSmallText = (szAssetText && *szAssetText) ? szAssetText : DEFAULT_APP_ASSET_SMALL_TEXT; | ||
| } | ||
| m_bUpdateRichPresence = true; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::SetPresenceState(const char* szState, bool bCustom) | ||
| { | ||
| if (bCustom) | ||
| m_strDiscordAppCustomState = szState; | ||
| else | ||
| m_strDiscordAppState = szState; | ||
|
|
||
| m_bUpdateRichPresence = true; | ||
| return true; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::SetPresenceButtons(unsigned short int iIndex, const char* szName, const char* szUrl) | ||
| { | ||
| // Should it always return true? | ||
| if (iIndex <= 2) | ||
| { | ||
| std::decay_t<decltype(*m_aButtons)> buttons; | ||
| if (m_aButtons) | ||
| buttons = *m_aButtons; | ||
|
|
||
| if (iIndex == 1) | ||
| std::get<0>(buttons) = {szName, szUrl}; | ||
| else if (iIndex == 2) | ||
| std::get<1>(buttons) = {szName, szUrl}; | ||
|
|
||
| m_aButtons = buttons; | ||
| m_bUpdateRichPresence = true; | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::SetPresenceDetails(const char* szDetails, bool bCustom) | ||
| { | ||
| m_strDiscordAppDetails = szDetails; | ||
| m_bUpdateRichPresence = true; | ||
| return true; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::ResetDiscordData() | ||
| { | ||
| SetDefaultData(); | ||
|
|
||
| if (m_bDiscordRPCEnabled) | ||
| { | ||
| RestartDiscord(); | ||
| m_bUpdateRichPresence = true; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::SetApplicationID(const char* szAppID) | ||
| { | ||
| m_strDiscordAppCurrentId = (szAppID && *szAppID) ? szAppID : DEFAULT_APP_ID; | ||
|
|
||
| if (m_bDiscordRPCEnabled) | ||
| { | ||
| RestartDiscord(); | ||
| m_bUpdateRichPresence = true; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::SetDiscordRPCEnabled(bool bEnabled) | ||
| { | ||
| m_bDiscordRPCEnabled = bEnabled; | ||
|
|
||
| if (!bEnabled) | ||
| { | ||
| ShutdownDiscord(); | ||
| return true; | ||
| } | ||
|
|
||
| InitializeDiscord(); | ||
| m_bUpdateRichPresence = true; | ||
| return true; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::IsDiscordRPCEnabled() const | ||
| { | ||
| return m_bDiscordRPCEnabled; | ||
| } | ||
|
|
||
| bool CDiscordRichPresence::IsDiscordCustomDetailsDisallowed() const | ||
| { | ||
| return m_bDisallowCustomDetails; | ||
| } |
Oops, something went wrong.
fdaa3acThere 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.
Congratulations & well done