vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

friend: Fixes PermissionLevel names (#2185)

Browse Source 
This PR fixes the permission level names, nothing more.
This commit is contained in:
Ac_K 2021-04-08 00:42:06 +02:00 committed by GitHub
parent d43a56726c
commit 58660c8536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs
View File

@ -4,11 +4,11 @@ using Ryujinx.HLE.HOS.Services.Friend.ServiceCreator;
namespace Ryujinx.HLE.HOS.Services.Friend namespace Ryujinx.HLE.HOS.Services.Friend
{ {
[Service("friend:a", FriendServicePermissionLevel.Admin)] [Service("friend:a", FriendServicePermissionLevel.Administrator)]
[Service("friend:m", FriendServicePermissionLevel.Manager)] [Service("friend:m", FriendServicePermissionLevel.Manager)]
[Service("friend:s", FriendServicePermissionLevel.System)] [Service("friend:s", FriendServicePermissionLevel.System)]
[Service("friend:u", FriendServicePermissionLevel.User)] [Service("friend:u", FriendServicePermissionLevel.User)]
[Service("friend:v", FriendServicePermissionLevel.Overlay)] [Service("friend:v", FriendServicePermissionLevel.Viewer)]
class IServiceCreator : IpcService class IServiceCreator : IpcService
{ {
private FriendServicePermissionLevel _permissionLevel; private FriendServicePermissionLevel _permissionLevel;

2
Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs
View File

@ -144,7 +144,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator
{ {
lock (_lock) lock (_lock)
{ {
if ((_permissionLevel & FriendServicePermissionLevel.OverlayMask) != 0 && _userId == targetId) if ((_permissionLevel & FriendServicePermissionLevel.ViewerMask) != 0 && _userId == targetId)
{ {
if (!_hasNewFriendRequest) if (!_hasNewFriendRequest)
{ {

3
Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/NotificationEventHandler.cs
View File

@ -1,5 +1,4 @@
using Ryujinx.HLE.HOS.Services.Account.Acc; using Ryujinx.HLE.HOS.Services.Account.Acc;
using Ryujinx.HLE.Utilities;
namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService
{ {
@ -81,4 +80,4 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService
} }
} }
} }
} }

12
Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/Types/FriendServicePermissionLevel.cs
View File

@ -6,14 +6,14 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator
enum FriendServicePermissionLevel enum FriendServicePermissionLevel
{ {
UserMask = 1, UserMask = 1,
OverlayMask = 2, ViewerMask = 2,
ManagerMask = 4, ManagerMask = 4,
SystemMask = 8, SystemMask = 8,
Admin = -1, Administrator = -1,
User = UserMask, User = UserMask,
Overlay = UserMask | OverlayMask, Viewer = UserMask | ViewerMask,
Manager = UserMask | OverlayMask | ManagerMask, Manager = UserMask | ViewerMask | ManagerMask,
System = UserMask | SystemMask System = UserMask | SystemMask
} }
} }