refetch avatar image if server indicates a newer one is available

Author: Jamiras

rcheevos

@@ -331,7 +331,7 @@ static void HandleLoginResponse(int nResult, const char* sErrorMessage, rc_clien
 
         // start fetching the avatar image
         ra::services::ServiceLocator::GetMutable<ra::ui::IImageRepository>().FetchImage(
-            ra::ui::ImageType::UserPic, pUser->username, pUser->avatar_url);
+            ra::ui::ImageType::UserPic, pUser->username, pUser->avatar_url, pUser->avatar_last_updated);
 
         // show the welcome message
         std::unique_ptr<ra::ui::viewmodels::PopupMessageViewModel> vmMessage(

src/Exports.cpp

@@ -194,7 +194,6 @@
     <ClInclude Include="api\FetchAchievementInfo.hh" />
     <ClInclude Include="api\FetchBadgeIds.hh" />
     <ClInclude Include="api\FetchLeaderboardInfo.hh" />
-    <ClInclude Include="api\FetchUserFriends.hh" />
     <ClInclude Include="api\impl\ConnectedServer.hh" />
     <ClInclude Include="api\impl\DisconnectedServer.hh" />
     <ClInclude Include="api\impl\OfflineServer.hh" />

src/RA_Integration.vcxproj

@@ -674,9 +674,6 @@
     <ClInclude Include="ui\win32\bindings\GridCheckBoxColumnBinding.hh">
       <Filter>UI\Win32\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="api\FetchUserFriends.hh">
-      <Filter>API</Filter>
-    </ClInclude>
     <ClInclude Include="ui\viewmodels\OverlayFriendsPageViewModel.hh">
       <Filter>UI\ViewModels</Filter>
     </ClInclude>

src/RA_Integration.vcxproj.filters

@@ -12,7 +12,6 @@ static ra::api::IServer& Server()
     return ra::services::ServiceLocator::GetMutable<ra::api::IServer>();
 }
 
-FetchUserFriends::Response FetchUserFriends::Request::Call() const { return Server().FetchUserFriends(*this); }
 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); }

src/api/ApiCall.cpp

@@ -5,7 +5,6 @@
 #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"
@@ -21,9 +20,6 @@ class IServer
 public:
     virtual const char* Name() const noexcept = 0;
 
-    // === user functions ===
-    virtual FetchUserFriends::Response FetchUserFriends(const FetchUserFriends::Request& request) = 0;
-
     // === game functions ===
     virtual ResolveHash::Response ResolveHash(const ResolveHash::Request& request) = 0;
     virtual UpdateAchievement::Response UpdateAchievement(const UpdateAchievement::Request& request) = 0;

src/api/FetchUserFriends.hh

@@ -432,67 +432,6 @@ static void HttpResponseToServerResponse(const ra::services::Http::Response& htt
     server_response->http_status_code = ra::etoi(httpResponse.StatusCode());
 }
 
-FetchUserFriends::Response ConnectedServer::FetchUserFriends(const FetchUserFriends::Request&)
-{
-    FetchUserFriends::Response response;
-
-    rc_api_fetch_followed_users_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();
-
-    rc_api_request_t api_request;
-    const int result = rc_api_init_fetch_followed_users_request(&api_request, &api_params);
-    if (result == RC_OK)
-    {
-        ra::services::Http::Response httpResponse;
-        if (DoRequest(api_request, FetchUserFriends::Name(), httpResponse, response))
-        {
-            rc_api_fetch_followed_users_response_t api_response;
-            rc_api_server_response_t server_response;
-            HttpResponseToServerResponse(httpResponse, &server_response);
-
-            const auto nResult = rc_api_process_fetch_followed_users_server_response(&api_response, &server_response);
-            if (ValidateResponse(nResult, api_response.response, ResolveHash::Name(), httpResponse.StatusCode(),
-                                 response))
-            {
-                response.Friends.resize(api_response.num_users);
-                for (uint32_t i = 0; i < api_response.num_users; ++i)
-                {
-                    auto& pFriend = response.Friends.at(i);
-                    const auto& pUser = api_response.users[i];
-                    pFriend.User = pUser.display_name;
-                    if (pUser.avatar_url)
-                        pFriend.AvatarUrl = pUser.avatar_url;
-                    pFriend.Score = pUser.score;
-                    if (pUser.recent_activity.description)
-                        pFriend.LastActivity = ra::util::String::Widen(pUser.recent_activity.description);
-                    pFriend.LastActivityContextId = pUser.recent_activity.context_id;
-                    if (pUser.recent_activity.context)
-                        pFriend.LastActivityContext = ra::util::String::Widen(pUser.recent_activity.context);
-                    if (pUser.recent_activity.context_image_url)
-                        pFriend.LastActivityImageUrl = pUser.recent_activity.context_image_url;
-                    pFriend.LastActivityTime = pUser.recent_activity.when;
-                }
-
-                response.Result = ApiResult::Success;
-            }
-
-            rc_api_destroy_fetch_followed_users_response(&api_response);
-        }
-    }
-    else
-    {
-        response.Result = ApiResult::Failed;
-        response.ErrorMessage = rc_error_str(result);
-    }
-
-    rc_api_destroy_request(&api_request);
-    return response;
-}
-
 ResolveHash::Response ConnectedServer::ResolveHash(const ResolveHash::Request& request)
 {
     ResolveHash::Response response;

src/api/IServer.hh

@@ -15,7 +15,6 @@ public:
 
     const char* Name() const noexcept override { return m_sHost.c_str(); }
 
-    FetchUserFriends::Response FetchUserFriends(const FetchUserFriends::Request& request) override;
     ResolveHash::Response ResolveHash(const ResolveHash::Request& request) override;
     UpdateAchievement::Response UpdateAchievement(const UpdateAchievement::Request& request) override;
     FetchAchievementInfo::Response FetchAchievementInfo(const FetchAchievementInfo::Request& request) override;

src/api/impl/ConnectedServer.cpp

@@ -15,13 +15,6 @@ namespace impl {
 class ServerBase : public IServer
 {
 public:
-    // === user functions ===
-
-    FetchUserFriends::Response FetchUserFriends(const FetchUserFriends::Request&) override
-    {
-        return UnsupportedApi<FetchUserFriends::Response>(FetchUserFriends::Name());
-    }
-
     // === game functions ===
 
     ResolveHash::Response ResolveHash(const ResolveHash::Request&) override