Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix proposal for "steam invitation not processed on launch" #3

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix proposal for "steam invitation not processed on launch" #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb2fdf
Fix proposal for "steam invitation not processed on launch"
jmderuty May 31, 2023
141c16c
Fix build steam.hpp
antlafarge May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions src/Stormancer.Plugins/Steam/cpp/Steam.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,9 @@ namespace Stormancer
{
public:

SteamPartyInvitation(const std::string& senderId, const Party::PartyId& partyId)
: _senderId(senderId)
, _partyId(partyId)
SteamPartyInvitation(const Party::PartyId& partyId, const std::string& senderSteamID = "")
: _partyId(partyId)
, _senderSteamID(senderSteamID)
{
}

Expand All @@ -351,7 +351,7 @@ namespace Stormancer

std::string getSenderId() override
{
return _senderId;
return _senderSteamID;
}

std::string getSenderPlatformId() override
Expand All @@ -366,8 +366,8 @@ namespace Stormancer

private:

std::string _senderId;
Party::PartyId _partyId;
std::string _senderSteamID;
};

class SteamPartyProvider;
Expand Down Expand Up @@ -414,6 +414,26 @@ namespace Stormancer
{
scheduleRunSteamAPiCallbacks();
}

auto connectLobbyArgument = steamConfig->getConnectLobby();

if (!connectLobbyArgument.empty())
{
if (auto invitationMessenger = _wInvitationMessenger.lock())
{
_logger->log(LogLevel::Trace, "Steam", "Process launch argument +connect_lobby", connectLobbyArgument);

SteamIDLobby steamIDLobby = std::stoull(connectLobbyArgument);

Party::PartyId partyId;
partyId.id = std::to_string(steamIDLobby);
partyId.type = PARTY_TYPE_STEAMIDLOBBY;
partyId.platform = platformName;

auto steamPartyInvitation = std::make_shared<SteamPartyInvitation>(partyId);
invitationMessenger->notifyInvitationReceived(steamPartyInvitation);
}
}
}

auto usersApi = _wUsersApi.lock();
Expand Down Expand Up @@ -1311,9 +1331,9 @@ namespace Stormancer
SteamID senderId = callback->m_steamIDFriend.ConvertToUint64();

Party::PartyId partyId;
partyId.platform = platformName;
partyId.type = PARTY_TYPE_STEAMIDLOBBY;
partyId.id = std::to_string(steamIDLobby);
partyId.type = PARTY_TYPE_STEAMIDLOBBY;
partyId.platform = platformName;

auto invitationMessenger = _wInvitationMessenger.lock();
if (!invitationMessenger)
Expand All @@ -1322,7 +1342,7 @@ namespace Stormancer
return;
}

auto steamPartyInvitation = std::make_shared<SteamPartyInvitation>(std::to_string(senderId), partyId);
auto steamPartyInvitation = std::make_shared<SteamPartyInvitation>(partyId, std::to_string(senderId));
invitationMessenger->notifyInvitationReceived(steamPartyInvitation);
}

Expand Down