leverage bulk codenote upload API (#1320)

Author: Jamiras

rcheevos

@@ -191,7 +191,6 @@
     <ClInclude Include="..\RAInterface\RA_Emulators.h" />
     <ClInclude Include="..\RAInterface\RA_Interface.h" />
     <ClInclude Include="api\ApiCall.hh" />
-    <ClInclude Include="api\DeleteCodeNote.hh" />
     <ClInclude Include="api\FetchAchievementInfo.hh" />
     <ClInclude Include="api\FetchBadgeIds.hh" />
     <ClInclude Include="api\FetchLeaderboardInfo.hh" />
@@ -203,7 +202,6 @@
     <ClInclude Include="api\IServer.hh" />
     <ClInclude Include="api\LatestClient.hh" />
     <ClInclude Include="api\UpdateAchievement.hh" />
-    <ClInclude Include="api\UpdateCodeNote.hh" />
     <ClInclude Include="api\UpdateLeaderboard.hh" />
     <ClInclude Include="api\UpdateRichPresence.hh" />
     <ClInclude Include="api\UploadBadge.hh" />

src/RA_Integration.vcxproj

@@ -650,12 +650,6 @@
     <ClInclude Include="ui\win32\bindings\RadioButtonBinding.hh">
       <Filter>UI\Win32\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="api\UpdateCodeNote.hh">
-      <Filter>API</Filter>
-    </ClInclude>
-    <ClInclude Include="api\DeleteCodeNote.hh">
-      <Filter>API</Filter>
-    </ClInclude>
     <ClInclude Include="api\FetchBadgeIds.hh">
       <Filter>API</Filter>
     </ClInclude>

src/RA_Integration.vcxproj.filters

@@ -14,8 +14,6 @@ static ra::api::IServer& Server()
 
 FetchUserFriends::Response FetchUserFriends::Request::Call() const { return Server().FetchUserFriends(*this); }
 ResolveHash::Response ResolveHash::Request::Call() const { return Server().ResolveHash(*this); }
-UpdateCodeNote::Response UpdateCodeNote::Request::Call() const { return Server().UpdateCodeNote(*this); }
-DeleteCodeNote::Response DeleteCodeNote::Request::Call() const { return Server().DeleteCodeNote(*this); }
 UpdateAchievement::Response UpdateAchievement::Request::Call() const { return Server().UpdateAchievement(*this); }
 FetchAchievementInfo::Response FetchAchievementInfo::Request::Call() const { return Server().FetchAchievementInfo(*this); }
 UpdateLeaderboard::Response UpdateLeaderboard::Request::Call() const { return Server().UpdateLeaderboard(*this); }

src/api/ApiCall.cpp

@@ -2,15 +2,13 @@
 #define RA_API_ISERVER_HH
 #pragma once
 
-#include "api/DeleteCodeNote.hh"
 #include "api/FetchAchievementInfo.hh"
 #include "api/FetchBadgeIds.hh"
 #include "api/FetchLeaderboardInfo.hh"
 #include "api/FetchUserFriends.hh"
 #include "api/LatestClient.hh"
 #include "api/ResolveHash.hh"
 #include "api/UpdateAchievement.hh"
-#include "api/UpdateCodeNote.hh"
 #include "api/UpdateLeaderboard.hh"
 #include "api/UpdateRichPresence.hh"
 #include "api/UploadBadge.hh"
@@ -28,8 +26,6 @@ public:
 
     // === game functions ===
     virtual ResolveHash::Response ResolveHash(const ResolveHash::Request& request) = 0;
-    virtual UpdateCodeNote::Response UpdateCodeNote(const UpdateCodeNote::Request& request) = 0;
-    virtual DeleteCodeNote::Response DeleteCodeNote(const DeleteCodeNote::Request& request) = 0;
     virtual UpdateAchievement::Response UpdateAchievement(const UpdateAchievement::Request& request) = 0;
     virtual FetchAchievementInfo::Response FetchAchievementInfo(const FetchAchievementInfo::Request& request) = 0;
     virtual UpdateLeaderboard::Response UpdateLeaderboard(const UpdateLeaderboard::Request& request) = 0;

src/api/DeleteCodeNote.hh

@@ -534,66 +534,6 @@ ResolveHash::Response ConnectedServer::ResolveHash(const ResolveHash::Request& r
     return response;
 }
 
-static void SetNote(ApiResponseBase& response, const char* sApiName,
-    unsigned nGameId, ra::data::ByteAddress nAddress, const char* sNote)
-{
-    rc_api_update_code_note_request_t api_params;
-    memset(&api_params, 0, sizeof(api_params));
-
-    const auto& pUserContext = ra::services::ServiceLocator::Get<ra::context::UserContext>();
-    api_params.username = pUserContext.GetUsername().c_str();
-    api_params.api_token = pUserContext.GetApiToken().c_str();
-
-    api_params.game_id = nGameId;
-    api_params.address = nAddress;
-    api_params.note = sNote;
-
-    rc_api_request_t api_request;
-    const int result = rc_api_init_update_code_note_request(&api_request, &api_params);
-    if (result == RC_OK)
-    {
-        ra::services::Http::Response httpResponse;
-        if (DoRequest(api_request, sApiName, httpResponse, response))
-        {
-            rc_api_update_code_note_response_t api_response;
-            const auto nResult = rc_api_process_update_code_note_response(&api_response, httpResponse.Content().c_str());
-
-            if (ValidateResponse(nResult, api_response.response, sApiName, httpResponse.StatusCode(), response))
-            {
-                response.Result = ApiResult::Success;
-            }
-
-            rc_api_destroy_update_code_note_response(&api_response);
-        }
-    }
-    else
-    {
-        response.Result = ApiResult::Failed;
-        response.ErrorMessage = rc_error_str(result);
-    }
-
-    rc_api_destroy_request(&api_request);
-}
-
-UpdateCodeNote::Response ConnectedServer::UpdateCodeNote(const UpdateCodeNote::Request& request)
-{
-    UpdateCodeNote::Response response;
-
-    const std::string sNote = ra::util::String::Narrow(request.Note);
-    SetNote(response, UpdateCodeNote::Name(), request.GameId, request.Address, sNote.c_str());
-
-    return response;
-}
-
-DeleteCodeNote::Response ConnectedServer::DeleteCodeNote(const DeleteCodeNote::Request& request)
-{
-    DeleteCodeNote::Response response;
-
-    SetNote(response, DeleteCodeNote::Name(), request.GameId, request.Address, nullptr);
-
-    return response;
-}
-
 UpdateAchievement::Response ConnectedServer::UpdateAchievement(const UpdateAchievement::Request& request)
 {
     UpdateAchievement::Response response;

src/api/IServer.hh

@@ -17,8 +17,6 @@ public:
 
     FetchUserFriends::Response FetchUserFriends(const FetchUserFriends::Request& request) override;
     ResolveHash::Response ResolveHash(const ResolveHash::Request& request) override;
-    UpdateCodeNote::Response UpdateCodeNote(const UpdateCodeNote::Request& request) override;
-    DeleteCodeNote::Response DeleteCodeNote(const DeleteCodeNote::Request& request) override;
     UpdateAchievement::Response UpdateAchievement(const UpdateAchievement::Request& request) override;
     FetchAchievementInfo::Response FetchAchievementInfo(const FetchAchievementInfo::Request& request) override;
     UpdateLeaderboard::Response UpdateLeaderboard(const UpdateLeaderboard::Request& request) override;

src/api/UpdateCodeNote.hh

@@ -29,16 +29,6 @@ public:
         return UnsupportedApi<ResolveHash::Response>(ResolveHash::Name());
     }
 
-    UpdateCodeNote::Response UpdateCodeNote(const UpdateCodeNote::Request&) override
-    {
-        return UnsupportedApi<UpdateCodeNote::Response>(UpdateCodeNote::Name());
-    }
-
-    DeleteCodeNote::Response DeleteCodeNote(const DeleteCodeNote::Request&) override
-    {
-        return UnsupportedApi<DeleteCodeNote::Response>(DeleteCodeNote::Name());
-    }
-
     UpdateAchievement::Response UpdateAchievement(const UpdateAchievement::Request&) override
     {
         return UnsupportedApi<UpdateAchievement::Response>(UpdateAchievement::Name());