diff --git a/src/main/java/me/bobert/netneutrality/utils/MusicUtils.java b/src/main/java/me/bobert/netneutrality/utils/MusicUtils.java index 4bf2ac3..155a2ce 100644 --- a/src/main/java/me/bobert/netneutrality/utils/MusicUtils.java +++ b/src/main/java/me/bobert/netneutrality/utils/MusicUtils.java @@ -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;