* Permission checks added.

Ree6-Applications · Jul 20, 2022 · e9ccfd3 · e9ccfd3
1 parent 870886d
commit e9ccfd3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/src/main/java/de/presti/ree6/commands/impl/community/TwitchNotifier.java b/src/main/java/de/presti/ree6/commands/impl/community/TwitchNotifier.java
@@ -5,6 +5,7 @@
 import de.presti.ree6.commands.interfaces.Command;
 import de.presti.ree6.commands.interfaces.ICommand;
 import de.presti.ree6.main.Main;
+import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 
@@ -13,6 +14,10 @@ public class TwitchNotifier implements ICommand {
 
     @Override
     public void onPerform(CommandEvent commandEvent) {
+        if (!commandEvent.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
+            Main.getInstance().getCommandManager().sendMessage("I need the permission `Manage Webhooks` to use this command!", commandEvent.getChannel(), commandEvent.getInteractionHook());
+        }
+
         if (commandEvent.isSlashCommand()) {
             Main.getInstance().getCommandManager().sendMessage("This Command doesn't support slash commands yet.", commandEvent.getChannel(), commandEvent.getInteractionHook());
             return;

diff --git a/src/main/java/de/presti/ree6/commands/impl/community/TwitterNotifier.java b/src/main/java/de/presti/ree6/commands/impl/community/TwitterNotifier.java
@@ -5,6 +5,7 @@
 import de.presti.ree6.commands.interfaces.Command;
 import de.presti.ree6.commands.interfaces.ICommand;
 import de.presti.ree6.main.Main;
+import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 
@@ -13,6 +14,10 @@ public class TwitterNotifier implements ICommand {
 
     @Override
     public void onPerform(CommandEvent commandEvent) {
+        if (!commandEvent.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
+            Main.getInstance().getCommandManager().sendMessage("I need the permission `Manage Webhooks` to use this command!", commandEvent.getChannel(), commandEvent.getInteractionHook());
+        }
+
         if (commandEvent.isSlashCommand()) {
             Main.getInstance().getCommandManager().sendMessage("This Command doesn't support slash commands yet.", commandEvent.getChannel(), commandEvent.getInteractionHook());
             return;

diff --git a/src/main/java/de/presti/ree6/commands/impl/community/YouTubeNotifier.java b/src/main/java/de/presti/ree6/commands/impl/community/YouTubeNotifier.java
@@ -5,6 +5,7 @@
 import de.presti.ree6.commands.interfaces.Command;
 import de.presti.ree6.commands.interfaces.ICommand;
 import de.presti.ree6.main.Main;
+import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 
@@ -13,6 +14,10 @@ public class YouTubeNotifier implements ICommand {
 
     @Override
     public void onPerform(CommandEvent commandEvent) {
+        if (!commandEvent.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
+            Main.getInstance().getCommandManager().sendMessage("I need the permission `Manage Webhooks` to use this command!", commandEvent.getChannel(), commandEvent.getInteractionHook());
+        }
+
         if (commandEvent.isSlashCommand()) {
             Main.getInstance().getCommandManager().sendMessage("This Command doesn't support slash commands yet.", commandEvent.getChannel(), commandEvent.getInteractionHook());
             return;

diff --git a/src/main/java/de/presti/ree6/events/OtherEvents.java b/src/main/java/de/presti/ree6/events/OtherEvents.java
@@ -503,6 +503,11 @@ private boolean checkPerms(Member member, MessageChannel channel) {
             return true;
         }
 
+        if (!member.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
+            channel.sendMessage("I do not have enough Permissions to create Webhooks").queue();
+            return true;
+        }
+
         return false;
     }
 }