From cb47a1622fd39dbd68d6b9eb9bbcdf03f30ae281 Mon Sep 17 00:00:00 2001 From: anthorob Date: Wed, 14 Oct 2026 08:32:32 -0400 Subject: [PATCH] Refactor `MusicAccess` permission checks Reordered admin check in `MusicAccess` for efficiency by prioritizing it before role-related logic. This improves readability and minimizes unnecessary role lookups for admin users. --- .../java/me/bobert/netneutrality/utils/MusicAccess.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/bobert/netneutrality/utils/MusicAccess.java b/src/main/java/me/bobert/netneutrality/utils/MusicAccess.java index 6794693..ab0cb2a 100644 --- a/src/main/java/me/bobert/netneutrality/utils/MusicAccess.java +++ b/src/main/java/me/bobert/netneutrality/utils/MusicAccess.java @@ -32,14 +32,12 @@ public final class MusicAccess { } Guild guild = member.getGuild(); + if (UserFunction.isAdmin(member)) { + return true; + } String roleDb = guildService.getGuildSettingService().getOrDefault(GSettings.MUSIC_ROLE); - if (roleDb != null && !roleDb.isEmpty()) { - if (UserFunction.isAdmin(member)) { - return true; - } - Role neededRole = guild.getRoleById(roleDb); if (neededRole == null) { // Role doesn't exist on guild anymore, remove from db