From 58660c853661f72e633b0a5fb459fe581545e331 Mon Sep 17 00:00:00 2001 From: Ac_K Date: Thu, 8 Apr 2021 00:42:06 +0200 Subject: [PATCH] friend: Fixes PermissionLevel names (#2185) This PR fixes the permission level names, nothing more. --- Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs | 4 ++-- .../Friend/ServiceCreator/INotificationService.cs | 2 +- .../NotificationService/NotificationEventHandler.cs | 3 +-- .../Types/FriendServicePermissionLevel.cs | 12 ++++++------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs index ea200f3d54..5110aea1e8 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs @@ -4,11 +4,11 @@ using Ryujinx.HLE.HOS.Services.Friend.ServiceCreator; namespace Ryujinx.HLE.HOS.Services.Friend { - [Service("friend:a", FriendServicePermissionLevel.Admin)] + [Service("friend:a", FriendServicePermissionLevel.Administrator)] [Service("friend:m", FriendServicePermissionLevel.Manager)] [Service("friend:s", FriendServicePermissionLevel.System)] [Service("friend:u", FriendServicePermissionLevel.User)] - [Service("friend:v", FriendServicePermissionLevel.Overlay)] + [Service("friend:v", FriendServicePermissionLevel.Viewer)] class IServiceCreator : IpcService { private FriendServicePermissionLevel _permissionLevel; diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs index d4481a4e02..b99fafbe67 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs @@ -144,7 +144,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator { lock (_lock) { - if ((_permissionLevel & FriendServicePermissionLevel.OverlayMask) != 0 && _userId == targetId) + if ((_permissionLevel & FriendServicePermissionLevel.ViewerMask) != 0 && _userId == targetId) { if (!_hasNewFriendRequest) { diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/NotificationEventHandler.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/NotificationEventHandler.cs index 4a698f812d..383ad006e1 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/NotificationEventHandler.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/NotificationEventHandler.cs @@ -1,5 +1,4 @@ using Ryujinx.HLE.HOS.Services.Account.Acc; -using Ryujinx.HLE.Utilities; namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService { @@ -81,4 +80,4 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService } } } -} +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/Types/FriendServicePermissionLevel.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/Types/FriendServicePermissionLevel.cs index 9c81136581..12a3d42fe4 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/Types/FriendServicePermissionLevel.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/Types/FriendServicePermissionLevel.cs @@ -6,14 +6,14 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator enum FriendServicePermissionLevel { UserMask = 1, - OverlayMask = 2, + ViewerMask = 2, ManagerMask = 4, SystemMask = 8, - Admin = -1, - User = UserMask, - Overlay = UserMask | OverlayMask, - Manager = UserMask | OverlayMask | ManagerMask, - System = UserMask | SystemMask + Administrator = -1, + User = UserMask, + Viewer = UserMask | ViewerMask, + Manager = UserMask | ViewerMask | ManagerMask, + System = UserMask | SystemMask } } \ No newline at end of file