GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — fix: Make permission group operations case-insensitive · RocketModFix/RocketModFix@bbe8c85

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Rocket/Rocket.Core/Permissions
- RocketPermissionsHelper.cs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Rocket/Rocket.Core/Permissions/RocketPermissionsHelper.cs‎`

Copy file name to clipboardExpand all lines: Rocket/Rocket.Core/Permissions/RocketPermissionsHelper.cs

+7-6Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,10 @@ internal RocketPermissionsProviderResult RemovePlayerFromGroup(string groupId, s`
`74`	`74`	`RocketPermissionsGroup g = GetGroup(groupId);`
`75`	`75`	`if (g == null) return RocketPermissionsProviderResult.GroupNotFound;`
`76`	`76`
`77`		`- if (g.Members.FirstOrDefault(m => m == playerId) == null) return RocketPermissionsProviderResult.PlayerNotFound;`
	`77`	`+ string memberToRemove = g.Members.FirstOrDefault(m => string.Equals(m, playerId, StringComparison.CurrentCultureIgnoreCase));`
	`78`	`+ if (memberToRemove == null) return RocketPermissionsProviderResult.PlayerNotFound;`
`78`	`79`
`79`		`- g.Members.Remove(playerId);`
	`80`	`+ g.Members.Remove(memberToRemove);`
`80`	`81`	`SaveGroup(g);`
`81`	`82`	`return RocketPermissionsProviderResult.Success;`
`82`	`83`	`}`
`@@ -91,7 +92,7 @@ internal RocketPermissionsProviderResult AddPlayerToGroup(string groupId, string`
`91`	`92`	`RocketPermissionsGroup g = GetGroup(groupId);`
`92`	`93`	`if (g == null) return RocketPermissionsProviderResult.GroupNotFound;`
`93`	`94`
`94`		`- if (g.Members.FirstOrDefault(m => m == playerId) != null) return RocketPermissionsProviderResult.DuplicateEntry;`
	`95`	`+ if (g.Members.FirstOrDefault(m => string.Equals(m, playerId, StringComparison.CurrentCultureIgnoreCase)) != null) return RocketPermissionsProviderResult.DuplicateEntry;`
`95`	`96`
`96`	`97`	`g.Members.Add(playerId);`
`97`	`98`	`SaveGroup(g);`
`@@ -110,7 +111,7 @@ internal RocketPermissionsProviderResult DeleteGroup(string groupId)`
`110`	`111`
`111`	`112`	`internal RocketPermissionsProviderResult SaveGroup(RocketPermissionsGroup group)`
`112`	`113`	`{`
`113`		`- int i = permissions.Instance.Groups.FindIndex(gr => gr.Id == group.Id);`
	`114`	`+ int i = permissions.Instance.Groups.FindIndex(gr => string.Equals(gr.Id, group.Id, StringComparison.CurrentCultureIgnoreCase));`
`114`	`115`	`if (i < 0) return RocketPermissionsProviderResult.GroupNotFound;`
`115`	`116`	`permissions.Instance.Groups[i] = group;`
`116`	`117`	`permissions.Save();`
`@@ -119,7 +120,7 @@ internal RocketPermissionsProviderResult SaveGroup(RocketPermissionsGroup group)`
`119`	`120`
`120`	`121`	`internal RocketPermissionsProviderResult AddGroup(RocketPermissionsGroup group)`
`121`	`122`	`{`
`122`		`- int i = permissions.Instance.Groups.FindIndex(gr => gr.Id == group.Id);`
	`123`	`+ int i = permissions.Instance.Groups.FindIndex(gr => string.Equals(gr.Id, group.Id, StringComparison.CurrentCultureIgnoreCase));`
`123`	`124`	`if (i != -1) return RocketPermissionsProviderResult.DuplicateEntry;`
`124`	`125`	`permissions.Instance.Groups.Add(group);`
`125`	`126`	`permissions.Save();`
`@@ -136,7 +137,7 @@ public List<RocketPermissionsGroup> GetGroups(string playerId, bool includeParen`
`136`	`137`	`{`
`137`	`138`	`// get player groups`
`138`	`139`	`List<RocketPermissionsGroup> groups = this.permissions.Instance?.Groups?.OrderBy(x => x.Priority)`
`139`		`- .Where(g => g.Members.Contains(playerId))`
	`140`	`+ .Where(g => g.Members.Any(m => string.Equals(m, playerId, StringComparison.CurrentCultureIgnoreCase)))`
`140`	`141`	`.ToList() ?? new List<RocketPermissionsGroup>();`
`141`	`142`
`142`	`143`	`// get first default group`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.