piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 13:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adds a UI for accepting Discord join requests in Dolphin

Browse Source 
also did these things
fixed crash from joining user that isn't hosting via a direct connection
current game stat can now pass to override the current game in config
uses ip endpoint from dolphin.org
This commit is contained in:
Sleepy Flower Girl
2018-07-20 18:27:43 -04:00
parent b7c241ea4c
commit c2aedb7649
16 changed files with 393 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
View File

@ -34,6 +34,7 @@
#include "Core/Config/GraphicsSettings.h"
#include "Core/Config/MainSettings.h"
#include "Core/Config/NetplaySettings.h"
#include "Core/Config/SYSCONFSettings.h"
#include "Core/ConfigLoaders/GameConfigLoader.h"
#include "Core/ConfigManager.h"
@ -461,6 +462,55 @@ void NetPlayDialog::show(std::string nickname, bool use_traversal)
UpdateGUI();
}
void NetPlayDialog::UpdateDiscordPresence()
{
#ifdef USE_DISCORD_PRESENCE
// both m_current_game and m_player_count need to be set for the status to be displayed correctly
if (m_player_count == 0 || m_current_game.empty())
return;
const auto use_default = [this]() {
Discord::UpdateDiscordPresence(m_player_count, Discord::SecretType::Empty, "", m_current_game);
};
if (g_TraversalClient)
{
const auto host_id = g_TraversalClient->GetHostID();
if (host_id == decltype(host_id)())
return use_default();
Discord::UpdateDiscordPresence(m_player_count, Discord::SecretType::RoomID,
std::string(host_id.begin(), host_id.end()), m_current_game);
}
else if (IsHosting())
{
if (m_exernal_ip_address.empty())
{
Common::HttpRequest request;
Common::HttpRequest::Response response =
request.Get("https://ip.dolphin-emu.org/", {{"X-Is-Dolphin", "1"}});
if (!response.has_value())
return use_default();
m_exernal_ip_address = std::string(response->begin(), response->end());
}
const int port = Settings::Instance().GetNetPlayServer()->GetPort();
Discord::UpdateDiscordPresence(m_player_count, Discord::SecretType::IPAddress,
Discord::CreateSecretFromIPAddress(m_exernal_ip_address, port),
m_current_game);
}
else
{
Discord::UpdateDiscordPresence(
m_player_count, Discord::SecretType::IPAddress,
Discord::CreateSecretFromIPAddress(Config::Get(Config::NETPLAY_HOST_CODE),
Config::Get(Config::NETPLAY_HOST_PORT)),
m_current_game);
}
#endif
}
void NetPlayDialog::UpdateGUI()
{
auto client = Settings::Instance().GetNetPlayClient();
@ -569,39 +619,10 @@ void NetPlayDialog::UpdateGUI()
m_hostcode_action_button->setEnabled(true);
}
if (m_old_player_count != player_count)
if (m_old_player_count != m_player_count)
{
if (m_use_traversal)
{
const auto host_id = g_TraversalClient->GetHostID();
Discord::UpdateDiscordPresence(player_count, Discord::SecretType::RoomID,
std::string(host_id.begin(), host_id.end()));
}
else
{
// Temporary soluation
// To Do: Don't rely on a service that Dolphin devs aren't in control of. Ask one of the
// project managers about this.
Common::HttpRequest request;
Common::HttpRequest::Response response = request.Get("https://www.myexternalip.com/raw");
if (!response.has_value())
return;
// The response ends with a /n and the - 1 removes that
std::string exernalIPAddress = std::string(response->begin(), response->end() - 1);
std::string port = std::to_string(Settings::Instance().GetNetPlayServer()->GetPort());
std::string secret;
secret.reserve(exernalIPAddress.length() + 1 + port.length());
secret += exernalIPAddress;
secret += ':';
secret += port;
Discord::UpdateDiscordPresence(player_count, Discord::SecretType::IPAddress, secret);
}
m_old_player_count = player_count;
UpdateDiscordPresence();
m_old_player_count = m_player_count;
}
}
@ -670,6 +691,7 @@ void NetPlayDialog::OnMsgChangeGame(const std::string& title)
QueueOnObject(this, [this, qtitle, title] {
m_game_button->setText(qtitle);
m_current_game = title;
UpdateDiscordPresence();
});
DisplayMessage(tr("Game changed to \"%1\"").arg(qtitle), "magenta");
}
@ -765,6 +787,18 @@ void NetPlayDialog::OnTraversalError(TraversalClient::FailureReason error)
});
}
void NetPlayDialog::OnTraversalStateChanged(TraversalClient::State state)
{
switch (state)
{
case TraversalClient::State::Connected:
case TraversalClient::State::Failure:
UpdateDiscordPresence();
default:
break;
}
}
void NetPlayDialog::OnSaveDataSyncFailure()
{
QueueOnObject(this, [this] { SetOptionsEnabled(true); });