Allow setting start time & party size via Lua

Lpsd · Oct 12, 2023 · 8371339 · 8371339
1 parent 8240c85
commit 8371339
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 0 deletions.
diff --git a/Client/core/CDiscordRichPresence.cpp b/Client/core/CDiscordRichPresence.cpp
@@ -101,6 +101,9 @@ void CDiscordRichPresence::UpdatePresence()
         discordPresence.buttons = buttons;
     }
 
+    discordPresence.partySize = (m_bDisallowCustomDetails) ? 0 : m_iPartySize;
+    discordPresence.partyMax = (m_bDisallowCustomDetails) ? 0 : m_iPartyMax;
+
     Discord_UpdatePresence(&discordPresence);
     m_bUpdateRichPresence = false;
 }
@@ -225,3 +228,9 @@ bool CDiscordRichPresence::IsDiscordCustomDetailsDisallowed() const
 {
     return m_bDisallowCustomDetails;
 }
+
+void CDiscordRichPresence::SetPresencePartySize(int iSize, int iMax)
+{
+    m_iPartySize = iSize;
+    m_iPartyMax = iMax;
+}
diff --git a/Client/core/CDiscordRichPresence.h b/Client/core/CDiscordRichPresence.h
@@ -34,6 +34,7 @@ class CDiscordRichPresence : public CDiscordInterface
     bool SetPresenceState(const char* szState, bool bCustom = false);
     bool SetPresenceDetails(const char* szDetails, bool bCustom = false);
     bool SetPresenceButtons(unsigned short int iIndex, const char* szName, const char* szUrl);
+    void SetPresencePartySize(int iSize, int iMax);
     bool SetDiscordRPCEnabled(bool bEnabled);
     bool IsDiscordCustomDetailsDisallowed() const;
     bool IsDiscordRPCEnabled() const;
@@ -63,4 +64,7 @@ class CDiscordRichPresence : public CDiscordInterface
     bool m_bDisallowCustomDetails;
     bool m_bDiscordRPCEnabled;
     bool m_bUpdateRichPresence;
+
+    int m_iPartySize;
+    int m_iPartyMax;
 };
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDiscordDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDiscordDefs.cpp
@@ -20,6 +20,8 @@ void CLuaDiscordDefs::LoadFunctions()
         {"setDiscordRichPresenceAsset", ArgumentParser<SetLargeAsset>},
         {"setDiscordRichPresenceSmallAsset", ArgumentParser<SetSmallAsset>},
         {"setDiscordRichPresenceButton", ArgumentParser<SetButtons>},
+        {"setDiscordRichPresenceStartTime", ArgumentParser<SetStartTime>},
+        {"setDiscordRichPresencePartySize", ArgumentParser<SetPartySize>},
         {"resetDiscordRichPresenceData", ArgumentParser<ResetData>},
         {"isDiscordRichPresenceConnected", ArgumentParser < IsDiscordRPCConnected>},
 
@@ -40,6 +42,8 @@ void CLuaDiscordDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "setAsset", "setDiscordRichPresenceAsset");
     lua_classfunction(luaVM, "setSmallAsset", "setDiscordRichPresenceSmallAsset");
     lua_classfunction(luaVM, "setButton", "setDiscordRichPresenceButton");
+    lua_classfunction(luaVM, "setStartTime", "setDiscordRichPresenceStartTime");
+    lua_classfunction(luaVM, "setPartySize", "setDiscordRichPresencePartySize");
 
     lua_classfunction(luaVM, "isConnected", "isDiscordRichPresenceConnected");
     //lua_classfunction(luaVM, "setAppID", "setDiscordRichPresenceAppID");
@@ -115,6 +119,39 @@ bool CLuaDiscordDefs::SetDetails(std::string strDetails)
     return true;
 }
 
+bool CLuaDiscordDefs::SetStartTime(unsigned long iSecondsSinceEpoch)
+{
+    auto discord = g_pCore->GetDiscord();
+
+    if (!discord || !discord->IsDiscordRPCEnabled())
+        return false;
+
+    if (discord->IsDiscordCustomDetailsDisallowed())
+        return false;
+
+    discord->SetPresenceStartTimestamp(iSecondsSinceEpoch);
+    return true;
+}
+bool CLuaDiscordDefs::SetPartySize(int iSize, int iMax)
+{
+    if (iMax < 0)
+        throw std::invalid_argument("Max size must be greater than or equal to 0");
+
+    if (iSize > iMax)
+        throw std::invalid_argument("Party size must be less than or equal to max party size");
+
+    auto discord = g_pCore->GetDiscord();
+
+    if (!discord || !discord->IsDiscordRPCEnabled())
+        return false;
+
+    if (discord->IsDiscordCustomDetailsDisallowed())
+        return false;
+
+    discord->SetPresencePartySize(iSize, iMax);
+    return true;
+}
+
 bool CLuaDiscordDefs::SetAsset(std::string szAsset, std::string szAssetText, bool bIsLarge)
 {
     int assetLength = szAsset.length();

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDiscordDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaDiscordDefs.h
@@ -25,6 +25,8 @@ class CLuaDiscordDefs : public CLuaDefs
     static bool SetButtons(unsigned short int iIndex, std::string szName, std::string szUrl);
     static bool SetLargeAsset(std::string szAsset, std::string szAssetText);
     static bool SetSmallAsset(std::string szAsset, std::string szAssetText);
+    static bool SetStartTime(unsigned long iSecondsSinceEpoch);
+    static bool SetPartySize(int iMin, int iMax);
     static bool IsDiscordRPCConnected();
 
 };

diff --git a/Client/sdk/core/CDiscordInterface.h b/Client/sdk/core/CDiscordInterface.h
@@ -23,6 +23,7 @@ class CDiscordInterface
     virtual void SetAssetSmallData(const char* szAsset, const char* szAssetText) = 0;
     virtual void SetPresenceStartTimestamp(const unsigned long ulStart) = 0;
     virtual bool SetPresenceButtons(unsigned short int iIndex, const char* szName, const char* szUrl) = 0;
+    virtual void SetPresencePartySize(int iSize, int iMax) = 0;
     //virtual void SetPresenceEndTimestamp(const unsigned long ulEnd) = 0;
 
     virtual bool SetDiscordRPCEnabled(bool bEnabled = false) = 0;