ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12580 from LillyJadeKatrin/retroachievements-bugfix 

Add user agent to headers for all RetroAchievements server calls
This commit is contained in:
JosJuice 2024-06-04 13:41:01 +02:00 committed by GitHub
parent 46a89936ae 9499e14209
commit c04460d88b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/Version.cpp
View File

@ -9,6 +9,8 @@
namespace Common namespace Common
{ {
#define EMULATOR_NAME "Dolphin"
#ifdef _DEBUG #ifdef _DEBUG
#define BUILD_TYPE_STR "Debug " #define BUILD_TYPE_STR "Debug "
#elif defined DEBUGFAST #elif defined DEBUGFAST
@ -19,7 +21,7 @@ namespace Common
const std::string& GetScmRevStr() const std::string& GetScmRevStr()
{ {
static const std::string scm_rev_str = "Dolphin " static const std::string scm_rev_str = EMULATOR_NAME " "
// Note this macro can be empty if the master branch does not exist. // Note this macro can be empty if the master branch does not exist.
#if 1 - SCM_COMMITS_AHEAD_MASTER - 1 != 0 #if 1 - SCM_COMMITS_AHEAD_MASTER - 1 != 0
"[" SCM_BRANCH_STR "] " "[" SCM_BRANCH_STR "] "
@ -51,6 +53,12 @@ const std::string& GetScmBranchStr()
return scm_branch_str; return scm_branch_str;
} }
const std::string& GetUserAgentStr()
{
static const std::string user_agent_str = EMULATOR_NAME "/" SCM_DESC_STR;
return user_agent_str;
}
const std::string& GetScmDistributorStr() const std::string& GetScmDistributorStr()
{ {
static const std::string scm_distributor_str = SCM_DISTRIBUTOR_STR; static const std::string scm_distributor_str = SCM_DISTRIBUTOR_STR;

1
Source/Core/Common/Version.h
View File

@ -11,6 +11,7 @@ const std::string& GetScmDescStr();
const std::string& GetScmBranchStr(); const std::string& GetScmBranchStr();
const std::string& GetScmRevStr(); const std::string& GetScmRevStr();
const std::string& GetScmRevGitStr(); const std::string& GetScmRevGitStr();
const std::string& GetUserAgentStr();
const std::string& GetScmDistributorStr(); const std::string& GetScmDistributorStr();
const std::string& GetScmUpdateTrackStr(); const std::string& GetScmUpdateTrackStr();
const std::string& GetNetplayDolphinVer(); const std::string& GetNetplayDolphinVer();

18
Source/Core/Core/AchievementManager.cpp
View File

@ -18,6 +18,7 @@
#include "Common/Image.h" #include "Common/Image.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
#include "Common/Version.h"
#include "Common/WorkQueueThread.h" #include "Common/WorkQueueThread.h"
#include "Core/Config/AchievementSettings.h" #include "Core/Config/AchievementSettings.h"
#include "Core/Core.h" #include "Core/Core.h"
@ -29,6 +30,9 @@
#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoEvents.h" #include "VideoCommon/VideoEvents.h"
static const Common::HttpRequest::Headers USER_AGENT_HEADER = {
{"User-Agent", Common::GetUserAgentStr()}};
AchievementManager& AchievementManager::GetInstance() AchievementManager& AchievementManager::GetInstance()
{ {
static AchievementManager s_instance; static AchievementManager s_instance;
@ -848,12 +852,9 @@ void AchievementManager::Request(const rc_api_request_t* request,
{ {
std::string url = request->url; std::string url = request->url;
std::string post_data = request->post_data; std::string post_data = request->post_data;
AchievementManager::GetInstance().m_queue.EmplaceItem([url = std::move(url), AchievementManager::GetInstance().m_queue.EmplaceItem(
post_data = std::move(post_data), [url = std::move(url), post_data = std::move(post_data), callback = std::move(callback),
callback = std::move(callback),
callback_data = std::move(callback_data)] { callback_data = std::move(callback_data)] {
const Common::HttpRequest::Headers USER_AGENT_HEADER = {{"User-Agent", "Dolphin/Placeholder"}};
Common::HttpRequest http_request; Common::HttpRequest http_request;
Common::HttpRequest::Response http_response; Common::HttpRequest::Response http_response;
if (!post_data.empty()) if (!post_data.empty())
@ -863,8 +864,8 @@ void AchievementManager::Request(const rc_api_request_t* request,
} }
else else
{ {
http_response = http_response = http_request.Get(url, USER_AGENT_HEADER,
http_request.Get(url, USER_AGENT_HEADER, Common::HttpRequest::AllowedReturnCodes::All); Common::HttpRequest::AllowedReturnCodes::All);
} }
rc_api_server_response_t server_response; rc_api_server_response_t server_response;
@ -939,7 +940,8 @@ void AchievementManager::FetchBadge(AchievementManager::Badge* badge, u32 badge_
ERROR_LOG_FMT(ACHIEVEMENTS, "Invalid request for image {}.", name_to_fetch); ERROR_LOG_FMT(ACHIEVEMENTS, "Invalid request for image {}.", name_to_fetch);
return; return;
} }
auto http_response = http_request.Get(api_request.url); auto http_response = http_request.Get(api_request.url, USER_AGENT_HEADER,
Common::HttpRequest::AllowedReturnCodes::All);
if (http_response.has_value() && http_response->size() <= 0) if (http_response.has_value() && http_response->size() <= 0)
{ {
WARN_LOG_FMT(ACHIEVEMENTS, "RetroAchievements connection failed on image request.\n URL: {}", WARN_LOG_FMT(ACHIEVEMENTS, "RetroAchievements connection failed on image request.\n URL: {}",