Skip to content

Fix: Make permission group operations case-insensitive (#107) #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunnamed434 merged 2 commits into from
Aug 24, 2025
Merged

Fix: Make permission group operations case-insensitive (#107) #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbe8c85
fix: Make permission group operations case-insensitive
Nonanti Aug 23, 2025
001b30d
Note in readme about fix for #107
sunnamed434 Aug 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ We're not planning to make any breaking changes with API.
- [ ] Fix /vanish.
- [x] Fix /god. (oxygen isn't fixed)
- [ ] Fix /p (not readable at all).
- [x] Make permission group operations case-insensitive ([see #107](https://github.com/RocketModFix/RocketModFix/issues/107))
- [ ] Performance.
- [x] New Features:
- [x] JSON file support (before it was only XML).
Expand Down
13 changes: 7 additions & 6 deletions Rocket/Rocket.Core/Permissions/RocketPermissionsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ internal RocketPermissionsProviderResult RemovePlayerFromGroup(string groupId, s
RocketPermissionsGroup g = GetGroup(groupId);
if (g == null) return RocketPermissionsProviderResult.GroupNotFound;

if (g.Members.FirstOrDefault(m => m == playerId) == null) return RocketPermissionsProviderResult.PlayerNotFound;
string memberToRemove = g.Members.FirstOrDefault(m => string.Equals(m, playerId, StringComparison.CurrentCultureIgnoreCase));
if (memberToRemove == null) return RocketPermissionsProviderResult.PlayerNotFound;

g.Members.Remove(playerId);
g.Members.Remove(memberToRemove);
SaveGroup(g);
return RocketPermissionsProviderResult.Success;
}
Expand All @@ -91,7 +92,7 @@ internal RocketPermissionsProviderResult AddPlayerToGroup(string groupId, string
RocketPermissionsGroup g = GetGroup(groupId);
if (g == null) return RocketPermissionsProviderResult.GroupNotFound;

if (g.Members.FirstOrDefault(m => m == playerId) != null) return RocketPermissionsProviderResult.DuplicateEntry;
if (g.Members.FirstOrDefault(m => string.Equals(m, playerId, StringComparison.CurrentCultureIgnoreCase)) != null) return RocketPermissionsProviderResult.DuplicateEntry;

g.Members.Add(playerId);
SaveGroup(g);
Expand All @@ -110,7 +111,7 @@ internal RocketPermissionsProviderResult DeleteGroup(string groupId)

internal RocketPermissionsProviderResult SaveGroup(RocketPermissionsGroup group)
{
int i = permissions.Instance.Groups.FindIndex(gr => gr.Id == group.Id);
int i = permissions.Instance.Groups.FindIndex(gr => string.Equals(gr.Id, group.Id, StringComparison.CurrentCultureIgnoreCase));
if (i < 0) return RocketPermissionsProviderResult.GroupNotFound;
permissions.Instance.Groups[i] = group;
permissions.Save();
Expand All @@ -119,7 +120,7 @@ internal RocketPermissionsProviderResult SaveGroup(RocketPermissionsGroup group)

internal RocketPermissionsProviderResult AddGroup(RocketPermissionsGroup group)
{
int i = permissions.Instance.Groups.FindIndex(gr => gr.Id == group.Id);
int i = permissions.Instance.Groups.FindIndex(gr => string.Equals(gr.Id, group.Id, StringComparison.CurrentCultureIgnoreCase));
if (i != -1) return RocketPermissionsProviderResult.DuplicateEntry;
permissions.Instance.Groups.Add(group);
permissions.Save();
Expand All @@ -136,7 +137,7 @@ public List<RocketPermissionsGroup> GetGroups(string playerId, bool includeParen
{
// get player groups
List<RocketPermissionsGroup> groups = this.permissions.Instance?.Groups?.OrderBy(x => x.Priority)
.Where(g => g.Members.Contains(playerId))
.Where(g => g.Members.Any(m => string.Equals(m, playerId, StringComparison.CurrentCultureIgnoreCase)))
.ToList() ?? new List<RocketPermissionsGroup>();

// get first default group
Expand Down