Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,16 @@ protected void execute(final CommandEvent event) {
return;
}

if (!event.getChannel().getType().isGuild()) {
event.reply("This command only works in guilds!");
return;
}

if (!Utils.memberHasRole(event.getMember(), MMDBot.getConfig().getRole("bot_maintainer"))) {
event.reply("Only Bot Maintainers can use this command.");
return;
}

Tricks.addTrick(trickType.createFromArgs(event.getArgs()));
event.getMessage().reply("Added trick!").mentionRepliedUser(false).queue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,16 @@ protected void execute(final CommandEvent event) {
return;
}

if (!event.getChannel().getType().isGuild()) {
event.reply("This command only works in guilds!");
return;
}

if (!Utils.memberHasRole(event.getMember(), MMDBot.getConfig().getRole("bot_maintainer"))) {
event.reply("Only Bot Maintainers can use this command.");
return;
}

Trick trick = trickType.createFromArgs(event.getArgs());
Optional<Trick> originalTrick = Tricks.getTricks().stream()
.filter(t -> t.getNames().stream().anyMatch(n -> trick.getNames().contains(n))).findAny();
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/mcmoddev/mmdbot/utilities/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,9 @@ public static String uppercaseFirstLetter(final String string) {
* @return if the member has the role
*/
public static boolean memberHasRole(final Member member, final long roleId) {
if (member == null) {
return false;
}
return member.getRoles().stream().anyMatch(r -> r.getIdLong() == roleId);
}

Expand Down