mirrors/Citron
1
0
Fork 0
mirror of https://git.citron-emu.org/Citron/Citron.git synced 2025-03-15 05:34:49 +00:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

service/friend: Clean up friend service implementation

Browse source 
- Remove unused function stubs
- Improve GetCompletionEvent implementation
- Clean up response builder naming
This commit is contained in:
Zephyron 2025-02-09 11:40:46 +10:00
parent 76716b5248
commit 384a18927b
No known key found for this signature in database
1 changed files with 8 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/core/hle/service/friend/friend.cpp
View file

@ -22,7 +22,7 @@ public:
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IFriendService::GetCompletionEvent, "GetCompletionEvent"}, {0, &IFriendService::GetCompletionEvent, "GetCompletionEvent"},
{1, &IFriendService::Cancel, "Cancel"}, {1, nullptr, "Cancel"},
{10100, nullptr, "GetFriendListIds"}, {10100, nullptr, "GetFriendListIds"},
{10101, &IFriendService::GetFriendList, "GetFriendList"}, {10101, &IFriendService::GetFriendList, "GetFriendList"},
{10102, nullptr, "UpdateFriendInfo"}, {10102, nullptr, "UpdateFriendInfo"},
@ -46,7 +46,7 @@ public:
{20101, &IFriendService::GetNewlyFriendCount, "GetNewlyFriendCount"}, {20101, &IFriendService::GetNewlyFriendCount, "GetNewlyFriendCount"},
{20102, nullptr, "GetFriendDetailedInfo"}, {20102, nullptr, "GetFriendDetailedInfo"},
{20103, nullptr, "SyncFriendList"}, {20103, nullptr, "SyncFriendList"},
{20104, &IFriendService::RequestSyncFriendList, "RequestSyncFriendList"}, {20104, nullptr, "RequestSyncFriendList"},
{20110, nullptr, "LoadFriendSetting"}, {20110, nullptr, "LoadFriendSetting"},
{20200, &IFriendService::GetReceivedFriendRequestCount, "GetReceivedFriendRequestCount"}, {20200, &IFriendService::GetReceivedFriendRequestCount, "GetReceivedFriendRequestCount"},
{20201, nullptr, "GetFriendRequestList"}, {20201, nullptr, "GetFriendRequestList"},
@ -59,10 +59,10 @@ public:
{20401, nullptr, "SyncBlockedUserList"}, {20401, nullptr, "SyncBlockedUserList"},
{20500, nullptr, "GetProfileExtraList"}, {20500, nullptr, "GetProfileExtraList"},
{20501, nullptr, "GetRelationship"}, {20501, nullptr, "GetRelationship"},
{20600, &IFriendService::GetUserPresenceView, "GetUserPresenceView"}, {20600, nullptr, "GetUserPresenceView"},
{20700, nullptr, "GetPlayHistoryList"}, {20700, nullptr, "GetPlayHistoryList"},
{20701, &IFriendService::GetPlayHistoryStatistics, "GetPlayHistoryStatistics"}, {20701, &IFriendService::GetPlayHistoryStatistics, "GetPlayHistoryStatistics"},
{20800, &IFriendService::LoadUserSetting, "LoadUserSetting"}, {20800, nullptr, "LoadUserSetting"},
{20801, nullptr, "SyncUserSetting"}, {20801, nullptr, "SyncUserSetting"},
{20900, nullptr, "RequestListSummaryOverlayNotification"}, {20900, nullptr, "RequestListSummaryOverlayNotification"},
{21000, nullptr, "GetExternalApplicationCatalog"}, {21000, nullptr, "GetExternalApplicationCatalog"},
@ -137,23 +137,11 @@ private:
static_assert(sizeof(SizedFriendFilter) == 0x10, "SizedFriendFilter is an invalid size"); static_assert(sizeof(SizedFriendFilter) == 0x10, "SizedFriendFilter is an invalid size");
void GetCompletionEvent(HLERequestContext& ctx) { void GetCompletionEvent(HLERequestContext& ctx) {
LOG_DEBUG(Service_Friend, "Retrieving completion event"); LOG_DEBUG(Service_Friend, "called");
const auto& event = completion_event->GetReadableEvent(); IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(ResultSuccess);
IPC::ResponseBuilder response{ctx, 2, 1}; rb.PushCopyObjects(completion_event->GetReadableEvent());
response.Push(event.Signal());
response.PushCopyObjects(event);
}
void Cancel(HLERequestContext& ctx) {
LOG_DEBUG(Service_Friend, "Cancelling friend service operation");
const auto& event = completion_event->GetReadableEvent();
IPC::ResponseBuilder response{ctx, 2};
response.Push(ResultSuccess);
response.PushCopyObjects(event);
} }
void GetFriendList(HLERequestContext& ctx) { void GetFriendList(HLERequestContext& ctx) {
@ -245,13 +233,6 @@ private:
rb.Push(0); rb.Push(0);
} }
void RequestSyncFriendList(HLERequestContext& ctx) {
LOG_DEBUG(Service_Friend, "Friend list sync requested");
IPC::ResponseBuilder response{ctx, 2};
response.Push(ResultSuccess);
}
void GetReceivedFriendRequestCount(HLERequestContext& ctx) { void GetReceivedFriendRequestCount(HLERequestContext& ctx) {
LOG_DEBUG(Service_Friend, "(STUBBED) called"); LOG_DEBUG(Service_Friend, "(STUBBED) called");
@ -260,16 +241,6 @@ private:
rb.Push(0); rb.Push(0);
} }
void GetUserPresenceView(HLERequestContext& ctx) {
IPC::RequestParser request{ctx};
const auto user_id = request.PopRaw<Common::UUID>();
LOG_DEBUG(Service_Friend, "Getting presence view for user {}", user_id.RawString());
IPC::ResponseBuilder response{ctx, 2};
response.Push(ResultSuccess);
}
void GetPlayHistoryStatistics(HLERequestContext& ctx) { void GetPlayHistoryStatistics(HLERequestContext& ctx) {
LOG_ERROR(Service_Friend, "(STUBBED) called, check in out"); LOG_ERROR(Service_Friend, "(STUBBED) called, check in out");
@ -277,13 +248,6 @@ private:
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
void LoadUserSetting(HLERequestContext& ctx) {
LOG_DEBUG(Service_Friend, "Loading friend service user settings");
IPC::ResponseBuilder response{ctx, 2};
response.Push(ResultSuccess);
}
void GetReceivedFriendInvitationCountCache(HLERequestContext& ctx) { void GetReceivedFriendInvitationCountCache(HLERequestContext& ctx) {
LOG_DEBUG(Service_Friend, "(STUBBED) called, check in out"); LOG_DEBUG(Service_Friend, "(STUBBED) called, check in out");