Eliminate FetchBadgeIds and LatestClient API helpers

src/Exports.cpp

@@ -6,7 +6,6 @@
 #include "RA_Resource.h"
 
 #include "api\IServer.hh"
-#include "api\impl\OfflineServer.hh"
 
 #include "context\IConsoleContext.hh"
 #include "context\IRcClient.hh"
@@ -103,7 +102,6 @@ static void InitializeOfflineMode()
     auto& pConfiguration = ra::services::ServiceLocator::GetMutable<ra::services::IConfiguration>();
     pConfiguration.SetFeatureEnabled(ra::services::Feature::Offline, true);
 
-    ra::services::ServiceLocator::Provide<ra::api::IServer>(std::make_unique<ra::api::impl::OfflineServer>());
     ra::services::ServiceLocator::Provide<ra::context::IRcClient>(std::make_unique<ra::services::impl::OfflineRcClient>());
 
     // reattach hooks to new rc_client_t

src/RA_Integration.vcxproj

@@ -74,8 +74,6 @@
   <ItemGroup>
     <ClCompile Include="api\ApiCall.cpp" />
     <ClCompile Include="api\impl\ConnectedServer.cpp" />
-    <ClCompile Include="api\impl\DisconnectedServer.cpp" />
-    <ClCompile Include="api\impl\OfflineServer.cpp" />
     <ClCompile Include="data\context\EmulatorContext.cpp" />
     <ClCompile Include="data\context\GameContext.cpp" />
     <ClCompile Include="data\context\SessionTracker.cpp" />
@@ -191,14 +189,11 @@
     <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" />
-    <ClInclude Include="api\impl\OfflineServer.hh" />
     <ClInclude Include="api\impl\ServerBase.hh" />
     <ClInclude Include="api\IServer.hh" />
-    <ClInclude Include="api\LatestClient.hh" />
     <ClInclude Include="api\UpdateAchievement.hh" />
     <ClInclude Include="api\UpdateLeaderboard.hh" />
     <ClInclude Include="api\UpdateRichPresence.hh" />

src/RA_Integration.vcxproj.filters

@@ -132,12 +132,6 @@
     <ClCompile Include="api\impl\ConnectedServer.cpp">
       <Filter>API\impl</Filter>
     </ClCompile>
-    <ClCompile Include="api\impl\DisconnectedServer.cpp">
-      <Filter>API\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="api\impl\OfflineServer.cpp">
-      <Filter>API\impl</Filter>
-    </ClCompile>
     <ClCompile Include="ui\drawing\gdi\GDISurface.cpp">
       <Filter>UI\Drawing\GDI</Filter>
     </ClCompile>
@@ -527,9 +521,6 @@
     <ClInclude Include="api\impl\DisconnectedServer.hh">
       <Filter>API\impl</Filter>
     </ClInclude>
-    <ClInclude Include="api\impl\OfflineServer.hh">
-      <Filter>API\impl</Filter>
-    </ClInclude>
     <ClInclude Include="ui\drawing\gdi\GDISurface.hh">
       <Filter>UI\Drawing\GDI</Filter>
     </ClInclude>
@@ -584,9 +575,6 @@
     <ClInclude Include="ui\win32\bindings\CheckBoxBinding.hh">
       <Filter>UI\Win32\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="api\LatestClient.hh">
-      <Filter>API</Filter>
-    </ClInclude>
     <ClInclude Include="ui\ViewModelCollection.hh">
       <Filter>UI</Filter>
     </ClInclude>
@@ -647,9 +635,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

@@ -18,8 +18,6 @@ FetchAchievementInfo::Response FetchAchievementInfo::Request::Call() const { ret
 UpdateLeaderboard::Response UpdateLeaderboard::Request::Call() const { return Server().UpdateLeaderboard(*this); }
 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/IServer.hh

@@ -3,9 +3,7 @@
 #pragma once
 
 #include "api/FetchAchievementInfo.hh"
-#include "api/FetchBadgeIds.hh"
 #include "api/FetchLeaderboardInfo.hh"
-#include "api/LatestClient.hh"
 #include "api/ResolveHash.hh"
 #include "api/UpdateAchievement.hh"
 #include "api/UpdateLeaderboard.hh"
@@ -29,8 +27,6 @@ public:
     virtual UpdateRichPresence::Response UpdateRichPresence(const UpdateRichPresence::Request& request) = 0;
 
     // === 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/impl/ConnectedServer.cpp

@@ -183,33 +183,6 @@ static void GetRequiredJsonField(_Out_ std::string& sValue, _In_ const rapidjson
     }
 }
 
-static void GetOptionalJsonField(_Out_ std::string& sValue, _In_ const rapidjson::Value& pDocument,
-    _In_ const char* const sField, _In_ const char* const sDefaultValue = "")
-{
-    if (pDocument.HasMember(sField))
-    {
-        auto& pField = pDocument[sField];
-        if (pField.IsString())
-            sValue = pField.GetString();
-        else
-            sValue = sDefaultValue;
-    }
-    else
-    {
-        sValue = sDefaultValue;
-    }
-}
-
-static void AppendUrlParam(_Inout_ std::string& sParams, _In_ const char* const sParam, _In_ const std::string& sValue)
-{
-    if (!sParams.empty() && sParams.back() != '?')
-        sParams.push_back('&');
-
-    sParams.append(sParam);
-    sParams.push_back('=');
-    ra::services::Http::UrlEncodeAppend(sParams, sValue);
-}
-
 static bool DoRequestWithoutLog(const rc_api_request_t& api_request, _UNUSED const char* sApiName, ra::services::Http::Response& pHttpResponse, ApiResponseBase& pResponse)
 {
     ra::services::Http::Request httpRequest(api_request.url);
@@ -752,73 +725,6 @@ UpdateRichPresence::Response ConnectedServer::UpdateRichPresence(const UpdateRic
     return response;
 }
 
-LatestClient::Response ConnectedServer::LatestClient(const LatestClient::Request& request)
-{
-    LatestClient::Response response;
-    rapidjson::Document document;
-    std::string sPostData;
-
-    // LatestClient doesn't require User/Password, so the next few lines are a subset of DoRequest
-    AppendUrlParam(sPostData, "r", "latestclient");
-    AppendUrlParam(sPostData, "e", std::to_string(request.EmulatorId));
-    RA_LOG_INFO("%s Request: %s", LatestClient::Name(), sPostData.c_str());
-
-    ra::services::Http::Request httpRequest(ra::util::String::Printf("%s/dorequest.php", m_sHost));
-    httpRequest.SetPostData(sPostData);
-
-    const auto httpResponse = httpRequest.Call();
-    if (GetJson(LatestClient::Name(), httpResponse, response, document))
-    {
-        response.Result = ApiResult::Success;
-        GetRequiredJsonField(response.LatestVersion, document, "LatestVersion", response);
-        GetOptionalJsonField(response.MinimumVersion, document, "MinimumVersion");
-        if (response.MinimumVersion.empty())
-            response.MinimumVersion = response.LatestVersion;
-    }
-
-    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.hh

@@ -21,8 +21,6 @@ public:
     UpdateLeaderboard::Response UpdateLeaderboard(const UpdateLeaderboard::Request& request) override;
     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/DisconnectedServer.hh

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "OfflineServer.hh"
+#include "ServerBase.hh"
 
 namespace ra {
 namespace api {
 namespace impl {
 
-class DisconnectedServer : public OfflineServer
+class DisconnectedServer : public ServerBase
 {
 public:
     explicit DisconnectedServer(const std::string& sHost) : m_sHost(sHost) {}
@@ -15,8 +15,6 @@ public:
 
     const std::string& Host() const noexcept { return m_sHost; }
 
-    LatestClient::Response LatestClient(const LatestClient::Request& request) override;
-
 private:
     const std::string m_sHost;
 };