diff --git a/src/main/java/listeners/MainEventListener.java b/src/main/java/listeners/MainEventListener.java index 2e3ec32..5091ea2 100644 --- a/src/main/java/listeners/MainEventListener.java +++ b/src/main/java/listeners/MainEventListener.java @@ -153,14 +153,14 @@ private void help(Member member, TextChannel channel, Server server, String[] ar if (isMentor(member) || isAdmin(member)) { embedBuilder.addField("$ready (mentor only)", "Retrieve the next person from the queue.", false); - embedBuilder.addField("$kick <@user> ", "Kick the specified user from the queue.", false); - embedBuilder.addField("$clear (mentor only)", "Clear the specified queue.", false); + embedBuilder.addField("$kick <@user> (mentor only)", "Kick the specified user from the queue.", false); embedBuilder.addField("$finish (mentor only)", "Finish a mentoring session. Must be run inside the text channel for that session.", false); } if (isAdmin(member)) { embedBuilder.addField("$maketopic (admin only)", "Create a new topic.", false); embedBuilder.addField("$deletetopic (admin only)", "Delete a topic.", false); + embedBuilder.addField("$clear (admin only)", "Clear the specified queue.", false); } channel.sendMessage(embedBuilder.build()).queue(); @@ -362,10 +362,10 @@ private void clear(Member member, TextChannel channel, Server server, String[] a Optional optionalTopic = checkTopicExists(member, channel, server, topicName); if (optionalTopic.isEmpty()) return; - // do not run if caller does not have mentor role for this topic or admin privileges + // do not run if caller is not an admin Topic topic = optionalTopic.get(); - if (!isMentor(member, topic) && !isAdmin(member)) { - BotResponses.noPermission(channel, member); + if (!isAdmin(member)) { + BotResponses.noAdminPermission(channel, member); return; }