Merge pull request #191 from KittyBot-Org/development

topi314 · web-flow · commit 25d4dd779229 · 2020-12-01T09:42:04.000+01:00
migrating to new image api
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/BiteCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/BiteCommand.java
@@ -4,15 +4,15 @@
 import de.kittybot.kittybot.objects.command.Category;
 import de.kittybot.kittybot.objects.command.CommandContext;
 
-public class BakaCommand extends ACommand{
+public class BiteCommand extends ACommand{
 
-	public static final String COMMAND = "baka";
-	public static final String USAGE = "baka <@user, ...>";
-	public static final String DESCRIPTION = "Says baka to a user";
-	protected static final String[] ALIASES = {"dummy", "dummi"};
+	public static final String COMMAND = "bite";
+	public static final String USAGE = "bite <@user, ...>";
+	public static final String DESCRIPTION = "Bites a user";
+	protected static final String[] ALIASES = {"beiß"};
 	protected static final Category CATEGORY = Category.NEKO;
 
-	public BakaCommand(){
+	public BiteCommand(){
 		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
 	}
 
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "baka", "said baka to");
+		sendReactionImage(ctx, false, "bite", "gif", "bites");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/BlushCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/BlushCommand.java
@@ -0,0 +1,25 @@
+package de.kittybot.kittybot.commands.neko;
+
+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.requests.Requester;
+
+public class BlushCommand extends ACommand{
+
+	public static final String COMMAND = "blush";
+	public static final String USAGE = "blush";
+	public static final String DESCRIPTION = "Blushes";
+	protected static final String[] ALIASES = {"beiß"};
+	protected static final Category CATEGORY = Category.NEKO;
+
+	public BlushCommand(){
+		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
+	}
+
+	@Override
+	public void run(CommandContext ctx){
+		queue(ctx, image(ctx, Requester.getNeko(false, "blush", "gif")));
+	}
+
+}
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/CatCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/CatCommand.java
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/CuddleCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/CuddleCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "cuddle", "cuddles");
+		sendReactionImage(ctx, false, "cuddle", "gif", "cuddles");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/DogCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/DogCommand.java
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/FeedCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/FeedCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "feed", "feeds");
+		sendReactionImage(ctx, false, "feed", "gif", "feeds");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/FluffCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/FluffCommand.java
@@ -0,0 +1,25 @@
+package de.kittybot.kittybot.commands.neko;
+
+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.requests.Requester;
+
+public class FluffCommand extends ACommand{
+
+	public static final String COMMAND = "fluff";
+	public static final String USAGE = "fluff";
+	public static final String DESCRIPTION = "Fluffs";
+	protected static final String[] ALIASES = {};
+	protected static final Category CATEGORY = Category.NEKO;
+
+	public FluffCommand(){
+		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
+	}
+
+	@Override
+	public void run(CommandContext ctx){
+		queue(ctx, image(ctx, Requester.getNeko(false, "fluff", "gif")));
+	}
+
+}
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/HugCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/HugCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "hug", "hugs");
+		sendReactionImage(ctx, false, "hug", "gif", "hugs");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/KissCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/KissCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "kiss", "kisses");
+		sendReactionImage(ctx, false, "kiss", "gif", "kisses");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/KitsuneCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/KitsuneCommand.java
@@ -0,0 +1,25 @@
+package de.kittybot.kittybot.commands.neko;
+
+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.requests.Requester;
+
+public class KitsuneCommand extends ACommand{
+
+	public static final String COMMAND = "kitsune";
+	public static final String USAGE = "kitsune";
+	public static final String DESCRIPTION = "Sends a Kitsune";
+	protected static final String[] ALIASES = {};
+	protected static final Category CATEGORY = Category.NEKO;
+
+	public KitsuneCommand(){
+		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
+	}
+
+	@Override
+	public void run(CommandContext ctx){
+		queue(ctx, image(ctx, Requester.getNeko(false, "kitsune", "img")));
+	}
+
+}
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/LickCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/LickCommand.java
@@ -4,29 +4,25 @@
 import de.kittybot.kittybot.objects.command.Category;
 import de.kittybot.kittybot.objects.command.CommandContext;
 
-public class SpankCommand extends ACommand{
+public class LickCommand extends ACommand{
 
-	public static final String COMMAND = "spank";
-	public static final String USAGE = "spank <@user, ...>";
-	public static final String DESCRIPTION = "Spanks a user";
-	protected static final String[] ALIASES = {};
+	public static final String COMMAND = "lick";
+	public static final String USAGE = "lick <@user, ...>";
+	public static final String DESCRIPTION = "Licks a user";
+	protected static final String[] ALIASES = {"leck"};
 	protected static final Category CATEGORY = Category.NEKO;
 
-	public SpankCommand(){
+	public LickCommand(){
 		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
 	}
 
 	@Override
 	public void run(CommandContext ctx){
-		if(!ctx.getChannel().isNSFW()){
-			sendError(ctx, "Sorry but this command can only be used in nsfw channels");
-			return;
-		}
 		if(ctx.getArgs().length == 0){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "spank", "spanks");
+		sendReactionImage(ctx, false, "lick", "gif", "licks");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/NekoCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/NekoCommand.java
@@ -1,23 +1,21 @@
 package de.kittybot.kittybot.commands.neko;
 
-import de.kittybot.kittybot.cache.ReactiveMessageCache;
-import de.kittybot.kittybot.objects.Emojis;
 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.requests.Requester;
 
 import java.util.Arrays;
-import java.util.List;
 
 public class NekoCommand extends ACommand{
 
 	public static final String COMMAND = "neko";
 	public static final String DESCRIPTION = "Sends a random/specified neko";
 	protected static final String[] ALIASES = {};
 	protected static final Category CATEGORY = Category.NEKO;
-	private static final String stringNekos = "femdom, tickle, classic, ngif, erofeet, meow, erok, poke, les, v3, hololewd, lewdk, keta, feetg, nsfw_neko_gif, eroyuri, kiss, 8ball, kuni, tits, pussy_jpg, cum_jpg, pussy, lewdkemo, lizard, slap, lewd, cum, cuddle, spank, goose, Random_hentai_gif, avatar, fox_girl, nsfw_avatar, hug, gecg, boobs, pat, feet, smug, kemonomimi, solog, holo, wallpaper, bj, woof, yuri, trap, anal, baka, blowjob, holoero, feed, neko, gasm, hentai, futanari, ero, solo, waifu, pwankg, eron, erokemo";
-	public static final String USAGE = "neko <" + stringNekos + ">";
-	private static final List<String> NEKOS = Arrays.asList(stringNekos.split(", "));
+	private static final String[] TYPES = {"neko", "anal", "blowjob", "cum", "fuck", "pussylick", "solo", "threesome_fff", "threesome_ffm", "threesome_mmf", "yaoi", "yuri"};
+	private static final String TYPE_STRING = String.join("/", TYPES);
+	public static final String USAGE = "neko <" + TYPE_STRING + "> <img/gif>";
 
 	public NekoCommand(){
 		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
@@ -26,18 +24,15 @@ public NekoCommand(){
 	@Override
 	public void run(CommandContext ctx){
 		if(!ctx.getChannel().isNSFW()){
-			sendError(ctx, "Sorry but this command can only be used in nsfw channels");
+			sendError(ctx, "This command is NSFW channel only");
 			return;
 		}
-		if(ctx.getArgs().length > 0 && NEKOS.contains(ctx.getArgs()[0])){
-			image(ctx, getNeko(ctx.getArgs()[0])).queue(message -> {
-				ReactiveMessageCache.addReactiveMessage(ctx, message, this, "-1");
-				message.addReaction(Emojis.WASTEBASKET).queue();
-			});
-		}
-		else{
-			sendUsage(ctx);
+		var args = ctx.getArgs();
+		var type = "neko";
+		if(args.length > 0 && Arrays.stream(TYPES).anyMatch(args[0]::equalsIgnoreCase)){
+			type = args[0].toLowerCase();
 		}
+		queue(ctx, image(ctx, Requester.getNeko(true, type, "gif")));
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/PatCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/PatCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "pat", "pats");
+		sendReactionImage(ctx, false, "pat", "gif", "pats");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/PokeCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/PokeCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "poke", "pokes");
+		sendReactionImage(ctx, false, "poke", "gif", "pokes");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/SenkoCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/SenkoCommand.java
@@ -0,0 +1,25 @@
+package de.kittybot.kittybot.commands.neko;
+
+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.requests.Requester;
+
+public class SenkoCommand extends ACommand{
+
+	public static final String COMMAND = "kitsune";
+	public static final String USAGE = "kitsune";
+	public static final String DESCRIPTION = "Sends a Kitsune";
+	protected static final String[] ALIASES = {};
+	protected static final Category CATEGORY = Category.NEKO;
+
+	public SenkoCommand(){
+		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
+	}
+
+	@Override
+	public void run(CommandContext ctx){
+		queue(ctx, image(ctx, Requester.getNeko(false, "senko", "img")));
+	}
+
+}
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/SlapCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/SlapCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "slap", "slaps");
+		sendReactionImage(ctx, false, "slap", "gif", "slaps");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/neko/TickleCommand.java b/src/main/java/de/kittybot/kittybot/commands/neko/TickleCommand.java
@@ -22,7 +22,7 @@ public void run(CommandContext ctx){
 			sendUsage(ctx);
 			return;
 		}
-		sendReactionImage(ctx, "tickle", "tickles");
+		sendReactionImage(ctx, false, "tickle", "gif", "tickles");
 	}
 
 }
diff --git a/src/main/java/de/kittybot/kittybot/commands/utilities/AvatarCommand.java b/src/main/java/de/kittybot/kittybot/commands/utilities/AvatarCommand.java
@@ -29,13 +29,14 @@ public void run(CommandContext ctx){
 			if(!Utils.isSnowflake(arg)){
 				continue;
 			}
-			try {
+			try{
 				var user = ctx.getJDA().retrieveUserById(arg).complete();
 				if(!users.contains(user)){
 					users.add(user);
 				}
 			}
-			catch(ErrorResponseException ignored){}
+			catch(ErrorResponseException ignored){
+			}
 		}
 		if(users.isEmpty()){
 			users.add(ctx.getUser());
diff --git a/src/main/java/de/kittybot/kittybot/database/Database.java b/src/main/java/de/kittybot/kittybot/database/Database.java
diff --git a/src/main/java/de/kittybot/kittybot/objects/command/ACommand.java b/src/main/java/de/kittybot/kittybot/objects/command/ACommand.java
diff --git a/src/main/java/de/kittybot/kittybot/objects/command/CommandManager.java b/src/main/java/de/kittybot/kittybot/objects/command/CommandManager.java
diff --git a/src/main/java/de/kittybot/kittybot/objects/requests/API.java b/src/main/java/de/kittybot/kittybot/objects/requests/API.java
diff --git a/src/main/java/de/kittybot/kittybot/objects/requests/Requester.java b/src/main/java/de/kittybot/kittybot/objects/requests/Requester.java

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void run(CommandContext ctx){`
`22`	`22`	`sendUsage(ctx);`
`23`	`23`	`return;`
`24`	`24`	`}`
`25`		`- sendReactionImage(ctx, "cuddle", "cuddles");`
	`25`	`+ sendReactionImage(ctx, false, "cuddle", "gif", "cuddles");`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`}`