Support for unpromoted leaderboards

src/RA_Integration.vcxproj

@@ -197,7 +197,6 @@
     <ClInclude Include="api\impl\ServerBase.hh" />
     <ClInclude Include="api\IServer.hh" />
     <ClInclude Include="api\UpdateAchievement.hh" />
-    <ClInclude Include="api\UpdateLeaderboard.hh" />
     <ClInclude Include="api\UpdateRichPresence.hh" />
     <ClInclude Include="api\UploadBadge.hh" />
     <ClInclude Include="data\context\EmulatorContext.hh" />

src/RA_Integration.vcxproj.filters

@@ -794,9 +794,6 @@
     <ClInclude Include="ui\viewmodels\NewAssetViewModel.hh">
       <Filter>UI\ViewModels</Filter>
     </ClInclude>
-    <ClInclude Include="api\UpdateLeaderboard.hh">
-      <Filter>API</Filter>
-    </ClInclude>
     <ClInclude Include="ui\viewmodels\PointerFinderViewModel.hh">
       <Filter>UI\ViewModels</Filter>
     </ClInclude>

src/api/ApiCall.cpp

@@ -15,7 +15,6 @@ static ra::api::IServer& Server()
 ResolveHash::Response ResolveHash::Request::Call() const { return Server().ResolveHash(*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); }
 FetchLeaderboardInfo::Response FetchLeaderboardInfo::Request::Call() const { return Server().FetchLeaderboardInfo(*this); }
 UpdateRichPresence::Response UpdateRichPresence::Request::Call() const { return Server().UpdateRichPresence(*this); }
 UploadBadge::Response UploadBadge::Request::Call() const { return Server().UploadBadge(*this); }

src/api/IServer.hh

@@ -6,7 +6,6 @@
 #include "api/FetchLeaderboardInfo.hh"
 #include "api/ResolveHash.hh"
 #include "api/UpdateAchievement.hh"
-#include "api/UpdateLeaderboard.hh"
 #include "api/UpdateRichPresence.hh"
 #include "api/UploadBadge.hh"
 
@@ -22,7 +21,6 @@ public:
     virtual ResolveHash::Response ResolveHash(const ResolveHash::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;
     virtual FetchLeaderboardInfo::Response FetchLeaderboardInfo(const FetchLeaderboardInfo::Request& request) = 0;
     virtual UpdateRichPresence::Response UpdateRichPresence(const UpdateRichPresence::Request& request) = 0;
 

src/api/impl/ConnectedServer.cpp

@@ -531,63 +531,6 @@ FetchAchievementInfo::Response ConnectedServer::FetchAchievementInfo(const Fetch
     return response;
 }
 
-UpdateLeaderboard::Response ConnectedServer::UpdateLeaderboard(const UpdateLeaderboard::Request& request)
-{
-    UpdateLeaderboard::Response response;
-
-    rc_api_update_leaderboard_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();
-
-    const std::string sTitle = ra::util::String::Narrow(request.Title);
-    const std::string sDescription = ra::util::String::Narrow(request.Description);
-
-    api_params.leaderboard_id = request.LeaderboardId;
-    api_params.game_id = request.GameId;
-    api_params.title = sTitle.c_str();
-    api_params.description = sDescription.c_str();
-    api_params.start_trigger = request.StartTrigger.c_str();
-    api_params.submit_trigger = request.SubmitTrigger.c_str();
-    api_params.cancel_trigger = request.CancelTrigger.c_str();
-    api_params.value_definition = request.ValueDefinition.c_str();
-    api_params.lower_is_better = request.LowerIsBetter ? 1 : 0;
-    api_params.format = ra::data::Value::FormatToServerEnum(request.Format);
-
-    rc_api_request_t api_request;
-    const int result = rc_api_init_update_leaderboard_request(&api_request, &api_params);
-    if (result == RC_OK)
-    {
-        ra::services::Http::Response httpResponse;
-        if (DoRequest(api_request, UpdateLeaderboard::Name(), httpResponse, response))
-        {
-            rc_api_update_leaderboard_response_t api_response;
-            rc_api_server_response_t server_response;
-            HttpResponseToServerResponse(httpResponse, &server_response);
-
-            const auto nResult = rc_api_process_update_leaderboard_server_response(&api_response, &server_response);
-
-            if (ValidateResponse(nResult, api_response.response, UpdateLeaderboard::Name(), httpResponse.StatusCode(), response))
-            {
-                response.Result = ApiResult::Success;
-                response.LeaderboardId = api_response.leaderboard_id;
-            }
-
-            rc_api_destroy_update_leaderboard_response(&api_response);
-        }
-    }
-    else
-    {
-        response.Result = ApiResult::Failed;
-        response.ErrorMessage = rc_error_str(result);
-    }
-
-    rc_api_destroy_request(&api_request);
-    return response;
-}
-
 FetchLeaderboardInfo::Response ConnectedServer::FetchLeaderboardInfo(const FetchLeaderboardInfo::Request& request)
 {
     FetchLeaderboardInfo::Response response;

src/api/impl/ConnectedServer.hh

@@ -18,7 +18,6 @@ public:
     ResolveHash::Response ResolveHash(const ResolveHash::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;
     FetchLeaderboardInfo::Response FetchLeaderboardInfo(const FetchLeaderboardInfo::Request& request) override;
     UpdateRichPresence::Response UpdateRichPresence(const UpdateRichPresence::Request& request) override;
     UploadBadge::Response UploadBadge(const UploadBadge::Request& request) override;

src/api/impl/ServerBase.hh

@@ -32,11 +32,6 @@ public:
         return UnsupportedApi<FetchAchievementInfo::Response>(FetchAchievementInfo::Name());
     }
 
-    UpdateLeaderboard::Response UpdateLeaderboard(const UpdateLeaderboard::Request&) override
-    {
-        return UnsupportedApi<UpdateLeaderboard::Response>(UpdateLeaderboard::Name());
-    }
-
     FetchLeaderboardInfo::Response FetchLeaderboardInfo(const FetchLeaderboardInfo::Request&) override
     {
         return UnsupportedApi<FetchLeaderboardInfo::Response>(FetchLeaderboardInfo::Name());

src/devkit/data/models/LeaderboardModel.cpp

@@ -318,6 +318,21 @@ void LeaderboardModel::SyncTrackerToRuntime() const
     }
 }
 
+void LeaderboardModel::SyncCategoryToRuntime() const
+{
+    switch (GetCategory())
+    {
+        case ra::data::models::AssetCategory::Promoted:
+        case ra::data::models::AssetCategory::Local:
+            m_pLeaderboardInfo->public_.category = RC_CLIENT_LEADERBOARD_CATEGORY_PROMOTED;
+            break;
+
+        default:
+            m_pLeaderboardInfo->public_.category = RC_CLIENT_LEADERBOARD_CATEGORY_UNPROMOTED;
+            break;
+    }
+}
+
 void LeaderboardModel::SyncDefinitionToRuntime()
 {
     Expects(m_pLeaderboardInfo != nullptr);
@@ -477,7 +492,7 @@ void LeaderboardModel::InitializeFromPublishedLeaderboard(
     SetID(pLeaderboard.public_.id);
     SetName(ra::util::String::Widen(pLeaderboard.public_.title));
     SetDescription(ra::util::String::Widen(pLeaderboard.public_.description));
-    SetCategory(AssetCategory::Promoted);
+    SetCategory(pLeaderboard.public_.category == RC_CLIENT_LEADERBOARD_CATEGORY_PROMOTED ? AssetCategory::Promoted : AssetCategory::Unpromoted);
     SetValueFormat(Value::FormatFromRcheevosFormat(pLeaderboard.format));
     SetLowerIsBetter(pLeaderboard.public_.lower_is_better);
     SetHidden(pLeaderboard.hidden);
@@ -535,6 +550,7 @@ void LeaderboardModel::SyncToLocalLeaderboardInfo()
     SyncTitleToRuntime();
     SyncDescriptionToRuntime();
     SyncDefinitionToRuntime();
+    SyncCategoryToRuntime();
     SyncValueFormatToRuntime();
 }
 

src/devkit/data/models/LeaderboardModel.hh

@@ -233,6 +233,7 @@ private:
     void SyncStateToRuntime(AssetState nNewState) const;
     void SyncValueFormatToRuntime() const;
     void SyncTrackerToRuntime() const;
+    void SyncCategoryToRuntime() const;
     void SyncDefinitionToRuntime();
 
     void SyncStateFromRuntime(uint8_t nState);

src/ui/viewmodels/AssetListViewModel.cpp

@@ -1250,9 +1250,6 @@ void AssetListViewModel::SaveSelected()
             {
                 switch (pAsset->GetType())
                 {
-                    case ra::data::models::AssetType::Leaderboard:
-                        ra::ui::viewmodels::MessageBoxViewModel::ShowWarningMessage(L"Leaderboards cannot be demoted.");
-                        return;
                     case ra::data::models::AssetType::RichPresence:
                         ra::ui::viewmodels::MessageBoxViewModel::ShowWarningMessage(L"Rich Presence cannot be demoted.");
                         return;