Add rc_client RequestV2 to AchievementManager

RequestV2 is to be passed into rc_client upon construction so rc_client can handle server calls internally.

Source/Core/Core/AchievementManager.cpp

@@ -12,7 +12,6 @@
 #include <rcheevos/include/rc_api_info.h>
 #include <rcheevos/include/rc_hash.h>
 
-#include "Common/HttpRequest.h"
 #include "Common/Image.h"
 #include "Common/Logging/Log.h"
 #include "Common/WorkQueueThread.h"
@@ -1706,4 +1705,48 @@ static std::unique_ptr<OSD::Icon> DecodeBadgeToOSDIcon(const AchievementManager:
   return icon;
 }
 
+void AchievementManager::RequestV2(const rc_api_request_t* request,
+                                   rc_client_server_callback_t callback, void* callback_data,
+                                   rc_client_t* client)
+{
+  std::string url = request->url;
+  std::string post_data = request->post_data;
+  AchievementManager::GetInstance().m_queue.EmplaceItem([url = std::move(url),
+                                                         post_data = std::move(post_data),
+                                                         callback = std::move(callback),
+                                                         callback_data = std::move(callback_data)] {
+    const Common::HttpRequest::Headers USER_AGENT_HEADER = {{"User-Agent", "Dolphin/Placeholder"}};
+
+    Common::HttpRequest http_request;
+    Common::HttpRequest::Response http_response;
+    if (!post_data.empty())
+    {
+      http_response = http_request.Post(url, post_data, USER_AGENT_HEADER,
+                                        Common::HttpRequest::AllowedReturnCodes::All);
+    }
+    else
+    {
+      http_response =
+          http_request.Get(url, USER_AGENT_HEADER, Common::HttpRequest::AllowedReturnCodes::All);
+    }
+
+    rc_api_server_response_t server_response;
+    if (http_response.has_value() && http_response->size() > 0)
+    {
+      server_response.body = reinterpret_cast<const char*>(http_response->data());
+      server_response.body_length = http_response->size();
+      server_response.http_status_code = http_request.GetLastResponseCode();
+    }
+    else
+    {
+      constexpr char error_message[] = "Failed HTTP request.";
+      server_response.body = error_message;
+      server_response.body_length = sizeof(error_message);
+      server_response.http_status_code = RC_API_SERVER_RESPONSE_RETRYABLE_CLIENT_ERROR;
+    }
+
+    callback(&server_response, callback_data);
+  });
+}
+
 #endif  // USE_RETRO_ACHIEVEMENTS

Source/Core/Core/AchievementManager.h

@@ -15,9 +15,11 @@
 
 #include <rcheevos/include/rc_api_runtime.h>
 #include <rcheevos/include/rc_api_user.h>
+#include <rcheevos/include/rc_client.h>
 #include <rcheevos/include/rc_runtime.h>
 
 #include "Common/Event.h"
+#include "Common/HttpRequest.h"
 #include "Common/WorkQueueThread.h"
 #include "DiscIO/Volume.h"
 
@@ -202,6 +204,8 @@ private:
                        const std::function<int(rc_api_request_t*, const RcRequest*)>& init_request,
                        const std::function<int(RcResponse*, const char*)>& process_response);
   ResponseType RequestImage(rc_api_fetch_image_request_t rc_request, Badge* rc_response);
+  static void RequestV2(const rc_api_request_t* request, rc_client_server_callback_t callback,
+                        void* callback_data, rc_client_t* client);
 
   rc_runtime_t m_runtime{};
   Core::System* m_system{};