eliminate FetchBadgeIds API helper

Author: Jamiras

src/RA_Integration.vcxproj

@@ -191,7 +191,6 @@
     <ClInclude Include="..\RAInterface\RA_Interface.h" />
     <ClInclude Include="api\ApiCall.hh" />
     <ClInclude Include="api\FetchAchievementInfo.hh" />
-    <ClInclude Include="api\FetchBadgeIds.hh" />
     <ClInclude Include="api\FetchLeaderboardInfo.hh" />
     <ClInclude Include="api\impl\ConnectedServer.hh" />
     <ClInclude Include="api\impl\DisconnectedServer.hh" />

src/RA_Integration.vcxproj.filters

@@ -647,9 +647,6 @@
     <ClInclude Include="ui\win32\bindings\RadioButtonBinding.hh">
       <Filter>UI\Win32\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="api\FetchBadgeIds.hh">
-      <Filter>API</Filter>
-    </ClInclude>
     <ClInclude Include="api\UploadBadge.hh">
       <Filter>API</Filter>
     </ClInclude>

src/api/ApiCall.cpp

@@ -19,7 +19,6 @@ UpdateLeaderboard::Response UpdateLeaderboard::Request::Call() const { return Se
 FetchLeaderboardInfo::Response FetchLeaderboardInfo::Request::Call() const { return Server().FetchLeaderboardInfo(*this); }
 UpdateRichPresence::Response UpdateRichPresence::Request::Call() const { return Server().UpdateRichPresence(*this); }
 LatestClient::Response LatestClient::Request::Call() const { return Server().LatestClient(*this); }
-FetchBadgeIds::Response FetchBadgeIds::Request::Call() const { return Server().FetchBadgeIds(*this); }
 UploadBadge::Response UploadBadge::Request::Call() const { return Server().UploadBadge(*this); }
 
 } // namespace api

src/api/FetchBadgeIds.hh

@@ -3,7 +3,6 @@
 #pragma once
 
 #include "api/FetchAchievementInfo.hh"
-#include "api/FetchBadgeIds.hh"
 #include "api/FetchLeaderboardInfo.hh"
 #include "api/LatestClient.hh"
 #include "api/ResolveHash.hh"
@@ -30,7 +29,6 @@ public:
 
     // === other functions ===
     virtual LatestClient::Response LatestClient(const LatestClient::Request& request) = 0;
-    virtual FetchBadgeIds::Response FetchBadgeIds(const FetchBadgeIds::Request& request) = 0;
     virtual UploadBadge::Response UploadBadge(const UploadBadge::Request& request) = 0;
 
 protected:

src/api/IServer.hh

@@ -779,46 +779,6 @@ LatestClient::Response ConnectedServer::LatestClient(const LatestClient::Request
     return response;
 }
 
-FetchBadgeIds::Response ConnectedServer::FetchBadgeIds(const FetchBadgeIds::Request&)
-{
-    FetchBadgeIds::Response response;
-
-    rc_api_fetch_badge_range_request_t api_params;
-    memset(&api_params, 0, sizeof(api_params));
-
-    rc_api_request_t api_request;
-    const int result = rc_api_init_fetch_badge_range_request(&api_request, &api_params);
-    if (result == RC_OK)
-    {
-        ra::services::Http::Response httpResponse;
-        if (DoRequest(api_request, FetchBadgeIds::Name(), httpResponse, response))
-        {
-            rc_api_fetch_badge_range_response_t api_response;
-            rc_api_server_response_t server_response;
-            HttpResponseToServerResponse(httpResponse, &server_response);
-
-            const auto nResult = rc_api_process_fetch_badge_range_server_response(&api_response, &server_response);
-
-            if (ValidateResponse(nResult, api_response.response, FetchBadgeIds::Name(), httpResponse.StatusCode(), response))
-            {
-                response.Result = ApiResult::Success;
-                response.FirstID = api_response.first_badge_id;
-                response.NextID = api_response.next_badge_id;
-            }
-
-            rc_api_destroy_fetch_badge_range_response(&api_response);
-        }
-    }
-    else
-    {
-        response.Result = ApiResult::Failed;
-        response.ErrorMessage = rc_error_str(result);
-    }
-
-    rc_api_destroy_request(&api_request);
-    return response;
-}
-
 UploadBadge::Response ConnectedServer::UploadBadge(const UploadBadge::Request& request)
 {
     UploadBadge::Response response;

src/api/impl/ConnectedServer.cpp

@@ -22,7 +22,6 @@ public:
     FetchLeaderboardInfo::Response FetchLeaderboardInfo(const FetchLeaderboardInfo::Request& request) override;
     UpdateRichPresence::Response UpdateRichPresence(const UpdateRichPresence::Request& request) override;
     LatestClient::Response LatestClient(const LatestClient::Request& request) override;
-    FetchBadgeIds::Response FetchBadgeIds(const FetchBadgeIds::Request& request) override;
     UploadBadge::Response UploadBadge(const UploadBadge::Request& request) override;
 
 private:

src/api/impl/ConnectedServer.hh

@@ -54,11 +54,6 @@ public:
         return UnsupportedApi<LatestClient::Response>(LatestClient::Name());
     }
 
-    FetchBadgeIds::Response FetchBadgeIds(const FetchBadgeIds::Request&) override
-    {
-        return UnsupportedApi<FetchBadgeIds::Response>(FetchBadgeIds::Name());
-    }
-
     UploadBadge::Response UploadBadge(const UploadBadge::Request&) override
     {
         return UnsupportedApi<UploadBadge::Response>(UploadBadge::Name());

src/api/impl/ServerBase.hh

@@ -224,7 +224,8 @@ void RcClient::CallApi(const std::string& sApi, const ra::services::Http::Reques
     void* pCallbackData) const
 {
     std::wstring sParameter;
-    if (sApi == "codenotes2") {
+    if (sApi == "codenotes2")
+    {
         const auto svGameId = FindParameter(pRequest.GetPostData(), "g=");
         if (!svGameId.empty())
             sParameter = ra::util::String::Widen(svGameId);

src/devkit/context/impl/RcClient.cpp

@@ -3,7 +3,7 @@
 #include "RA_Defs.h"
 #include "RA_Resource.h"
 
-#include "api\FetchBadgeIds.hh"
+#include "context\IRcClient.hh"
 
 #include "data\context\EmulatorContext.hh"
 
@@ -20,6 +20,8 @@
 #include "util\EnumOps.hh"
 #include "util\Log.hh"
 
+#include <rcheevos/include/rc_api_editor.h>
+
 using ra::data::models::AssetModelBase;
 using ra::data::models::AchievementModel;
 using ra::ui::viewmodels::AssetEditorViewModel;
@@ -513,6 +515,36 @@ void AssetEditorDialog::BadgeNameBinding::UpdateSourceFromText(const std::wstrin
 
 void AssetEditorDialog::BadgeNameBinding::UpdateTextFromSource(const std::wstring& sText)
 {
+    if (m_nMinimum == 0 && !ra::util::String::StartsWith(sText, L"local\\"))
+    {
+        const auto& pRcClient = ra::services::ServiceLocator::Get<ra::context::IRcClient>();
+
+        rc_api_fetch_badge_range_request_t api_params;
+        memset(&api_params, 0, sizeof(api_params));
+
+        rc_api_request_t api_request;
+        const int nResult = rc_api_init_fetch_badge_range_request_hosted(&api_request, &api_params, pRcClient.GetHost());
+        if (nResult == RC_OK)
+        {
+            pRcClient.DispatchRequest(api_request, [this](const rc_api_server_response_t& server_response, void*)
+            {
+                rc_api_fetch_badge_range_response_t api_response;
+                const auto nResult = rc_api_process_fetch_badge_range_server_response(&api_response, &server_response);
+                if (nResult == RC_OK)
+                {
+                    SetRange(ra::to_signed(api_response.first_badge_id),
+                        ra::to_signed(api_response.next_badge_id) - 1);
+
+                    InvokeOnUIThread([hWnd = m_hWndSpinner]() noexcept { ::EnableWindow(hWnd, true); });
+                }
+
+                rc_api_destroy_fetch_badge_range_response(&api_response);
+            }, nullptr);
+
+            rc_api_destroy_request(&api_request);
+        }
+    }
+
     InvokeOnUIThread([this, sTextCopy = sText]()
     {
         if (ra::util::String::StartsWith(sTextCopy, L"local\\"))
@@ -523,21 +555,7 @@ void AssetEditorDialog::BadgeNameBinding::UpdateTextFromSource(const std::wstrin
         else
         {
             SetWindowTextW(m_hWnd, sTextCopy.c_str());
-
-            if (m_nMinimum == 0)
-            {
-                ::EnableWindow(m_hWndSpinner, false);
-
-                ra::api::FetchBadgeIds::Request request;
-                request.CallAsync([this](const ra::api::FetchBadgeIds::Response& response) {
-                    SetRange(ra::to_signed(response.FirstID), ra::to_signed(response.NextID) - 1);
-                    InvokeOnUIThread([hWnd = m_hWndSpinner]() noexcept { ::EnableWindow(hWnd, true); });
-                });
-            }
-            else
-            {
-                ::EnableWindow(m_hWndSpinner, true);
-            }
+            ::EnableWindow(m_hWndSpinner, (m_nMinimum != 0));
         }
     });
 }