Merge pull request #196 from KittyBot-Org/development

emote restriction reset fixes
settings command fixes

Author: topi314

build.gradle

@@ -34,7 +34,7 @@ dependencies {
     implementation("com.github.KittyBot-Org:Lavalink-Client:f7842dfdb4") {
         exclude group: 'com.sedmelluq', module: 'lavaplayer'
     }
-    implementation 'com.sedmelluq:lavaplayer:1.3.62'
+    implementation 'com.sedmelluq:lavaplayer:1.3.63'
     implementation 'com.sedmelluq:jda-nas:1.1.0'
 
     // database
@@ -49,7 +49,7 @@ dependencies {
     implementation 'io.sentry:sentry-logback:3.2.0'
 
     // eval
-    implementation 'org.codehaus.groovy:groovy-jsr223:3.0.6'
+    implementation 'org.codehaus.groovy:groovy-jsr223:3.0.7'
 
     // jjwt
     implementation 'io.jsonwebtoken:jjwt-api:0.11.2'

src/main/java/de/kittybot/kittybot/commands/neko/BiteCommand.java

@@ -18,10 +18,6 @@ public BiteCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "bite", "gif", "bites");
 	}
 

src/main/java/de/kittybot/kittybot/commands/neko/CuddleCommand.java

@@ -18,10 +18,6 @@ public CuddleCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "cuddle", "gif", "cuddles");
 	}
 

src/main/java/de/kittybot/kittybot/commands/neko/FeedCommand.java

@@ -18,10 +18,6 @@ public FeedCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "feed", "gif", "feeds");
 	}
 

src/main/java/de/kittybot/kittybot/commands/neko/HugCommand.java

@@ -18,10 +18,6 @@ public HugCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "hug", "gif", "hugs");
 	}
 

src/main/java/de/kittybot/kittybot/commands/neko/KissCommand.java

@@ -18,10 +18,6 @@ public KissCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "kiss", "gif", "kisses");
 	}
 

src/main/java/de/kittybot/kittybot/commands/neko/LickCommand.java

@@ -18,10 +18,6 @@ public LickCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "lick", "gif", "licks");
 	}
 

src/main/java/de/kittybot/kittybot/commands/neko/NekoCommand.java

@@ -1,8 +1,11 @@
 package de.kittybot.kittybot.commands.neko;
 
+import de.kittybot.kittybot.cache.GuildSettingsCache;
+import de.kittybot.kittybot.database.Database;
 import de.kittybot.kittybot.objects.command.ACommand;
 import de.kittybot.kittybot.objects.command.Category;
 import de.kittybot.kittybot.objects.command.CommandContext;
+import de.kittybot.kittybot.objects.data.GuildSettings;
 import de.kittybot.kittybot.objects.requests.Requester;
 
 import java.util.Arrays;
@@ -23,6 +26,10 @@ public NekoCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
+		if(!GuildSettingsCache.isNSFWEnabled(ctx.getGuild().getId())){
+			sendError(ctx, "NSFW commands are disabled in this guild");
+			return;
+		}
 		if(!ctx.getChannel().isNSFW()){
 			sendError(ctx, "This command is NSFW channel only");
 			return;

src/main/java/de/kittybot/kittybot/commands/neko/PatCommand.java

@@ -18,10 +18,6 @@ public PatCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "pat", "gif", "pats");
 	}
 

src/main/java/de/kittybot/kittybot/commands/neko/PokeCommand.java

@@ -18,10 +18,6 @@ public PokeCommand(){
 
 	@Override
 	public void run(CommandContext ctx){
-		if(ctx.getArgs().length == 0){
-			sendUsage(ctx);
-			return;
-		}
 		sendReactionImage(ctx, false, "poke", "gif", "pokes");
 	}