fix: some fixes

Softawii · Jun 26, 2022 · 6105143 · 6105143
1 parent 4095477
commit 6105143
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/softawii/capivara/listeners/PackageGroup.java b/src/main/java/com/softawii/capivara/listeners/PackageGroup.java
@@ -253,7 +253,7 @@ public static void edit(SlashCommandInteractionEvent event) {
             try {
                 packageManager.editRole(guildId, packageName, name, role, description, emojiString, isUnicode);
                 LOGGER.info("edit: Role edited successfully");
-                MessageEmbed embed = Utils.simpleEmbed("Cargo editado!", String.format("O cargo '%s' foi editado com sucesso no pacote '%s'!", role.getAsMention(), packageName), Color.GREEN);
+                MessageEmbed embed = Utils.simpleEmbed("Cargo editado!", String.format("O cargo '%s' foi editado com sucesso no pacote '%s'!", name, packageName), Color.GREEN);
                 event.replyEmbeds(embed).setEphemeral(true).queue();
             } catch (PackageDoesNotExistException e) {
                 LOGGER.debug("edit: PackageDoesNotExistException");

diff --git a/src/main/java/com/softawii/capivara/listeners/RoleGroup.java b/src/main/java/com/softawii/capivara/listeners/RoleGroup.java
@@ -150,7 +150,7 @@ public static void permissions(SlashCommandInteractionEvent event) {
 
             Role role = event.getOption("role").getAsRole();
 
-            if(canInteract(event.getGuild().getSelfMember(), role)) {
+            if(!canInteract(event.getGuild().getSelfMember(), role)) {
                 MessageEmbed embed = Utils.simpleEmbed("Sem permissão irmão", "Esse cargo ta acima acima do meu! Missão Impossível", Color.RED);
                 event.replyEmbeds(embed).setEphemeral(true).queue();
                 return;
@@ -283,7 +283,7 @@ public static void cancel(ButtonInteractionEvent event) {
     public static boolean canInteract(Member member, Role role) {
 
         int rolePosition = role.getPosition();
-        int botPosition = member.getRoles().isEmpty() ? -1 : member.getRoles().get(0).getPosition();
+        int botPosition = member.getRoles().isEmpty() ? -1 : member.getRoles().stream().map(Role::getPosition).max(Integer::compareTo).get();
 
         if(botPosition == -1 || rolePosition >= botPosition) {
             return false;