Optimize isUserDj logic

This commit is contained in:
anthorob committed 2026-10-18 01:49:46 -04:00
1 parent cb47a1622f
commit 78d6ade17a
1 file changed
+4 -5
@@ -8,7 +8,6 @@ import me.bobert.netneutrality.context.MusicChannelContext;
* https://discord.gg/qUa6zNFZsd
*/
import me.bobert.netneutrality.context.command.SlashCommandContext;
import me.bobert.netneutrality.core.context.Context;
import me.bobert.netneutrality.db.GSettings;
import me.bobert.netneutrality.exceptions.ContextException;
@@ -94,14 +93,14 @@ public class MusicUtils {
}
public static boolean isUserDj(Context context, MusicManager manager) {
if (context instanceof SlashCommandContext) {
return true;
}
return isUserDj(context.getGuildUser(), manager);
}
public static boolean isUserDj(Member member, MusicManager manager) {
if (UserFunction.isAdmin(member)) {
return true;
}
String djRoleId = manager.getGuildService().getGuildSettingService().getOrDefault(GSettings.MUSIC_DJ_ROLE);
if (djRoleId != null && !djRoleId.isEmpty() && member.getRoles().stream().anyMatch(role -> role.getId().equals(djRoleId))) {
return true;