aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE
diff options
context:
space:
mode:
authorAc_K <Acoustik666@gmail.com>2021-04-08 00:42:06 +0200
committerGitHub <noreply@github.com>2021-04-08 00:42:06 +0200
commit58660c853661f72e633b0a5fb459fe581545e331 (patch)
treed1ae7bae5ac97dd306204dbb06614a5c4fd8cc6b /Ryujinx.HLE
parentd43a56726c0640d1af00c58b284e7f6d949302d9 (diff)
friend: Fixes PermissionLevel names (#2185)
This PR fixes the permission level names, nothing more.
Diffstat (limited to 'Ryujinx.HLE')
-rw-r--r--Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs4
-rw-r--r--Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/NotificationEventHandler.cs3
-rw-r--r--Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/Types/FriendServicePermissionLevel.cs12
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 ea200f3d..5110aea1 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 d4481a4e..b99fafbe 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 4a698f81..383ad006 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 9c811365..12a3d42f 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