Merge pull request #172 from KittyBot-Org/development

some bug fixes & restrict emote command

Author: topi314

build.gradle

@@ -27,26 +27,26 @@ repositories {
 
 dependencies {
     // discord/jda related
-    implementation 'net.dv8tion:JDA:4.2.0_214'
+    implementation 'net.dv8tion:JDA:4.2.0_222'
     implementation 'com.jagrosh:jda-utilities:3.0.5'
 
     // audio
     implementation("com.github.KittyBot-Org:Lavalink-Client:f7842dfdb4") {
         exclude group: 'com.sedmelluq', module: 'lavaplayer'
     }
-    implementation 'com.sedmelluq:lavaplayer:1.3.59'
+    implementation 'com.sedmelluq:lavaplayer:1.3.62'
     implementation 'com.sedmelluq:jda-nas:1.1.0'
 
     // database
     implementation 'com.zaxxer:HikariCP:3.4.5'
-    implementation 'org.jooq:jooq:3.14.2'
+    implementation 'org.jooq:jooq:3.14.4'
 
     implementation 'org.postgresql:postgresql:42.2.18'
     jooqGenerator 'org.postgresql:postgresql:42.2.18'
 
     // logging
     implementation 'ch.qos.logback:logback-classic:1.3.0-alpha5'
-    implementation 'io.sentry:sentry-logback:3.1.3'
+    implementation 'io.sentry:sentry-logback:3.2.0'
 
     // eval
     implementation 'org.codehaus.groovy:groovy-jsr223:3.0.6'
@@ -57,11 +57,12 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-jackson:0.11.2'
 
     // other
-    implementation 'io.javalin:javalin:3.11.2'
+    implementation 'io.javalin:javalin:3.12.0'
     implementation 'io.github.classgraph:classgraph:4.8.90'
 }
 
 jooq {
+    version = '3.14.4'
     configurations {
         main {
             generateSchemaSourceOnCompilation = false

src/main/java/de/kittybot/kittybot/WebService.java

@@ -24,6 +24,7 @@
 import io.jsonwebtoken.security.Keys;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.exceptions.HttpException;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 
@@ -104,6 +105,9 @@ private void login(Context ctx){
 			var session = (DashboardSession) O_AUTH_2_CLIENT.startSession(code, state, "", SCOPES).complete();
 			created(ctx, DataObject.empty().put("token", Jwts.builder().setIssuedAt(new Date()).setSubject(session.getUserId()).signWith(KEY).compact()));
 		}
+		catch(HttpException e){
+			error(ctx, 429, "Don't spam login");
+		}
 		catch(InvalidStateException e){
 			error(ctx, 401, "State invalid/expired. Please try again");
 		}

src/main/java/de/kittybot/kittybot/cache/GuildCache.java

@@ -6,6 +6,7 @@
 import de.kittybot.kittybot.objects.session.DashboardSession;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.exceptions.HttpException;
 
 import java.io.IOException;
 import java.util.*;
@@ -18,7 +19,7 @@ public class GuildCache{
 
 	private GuildCache(){}
 
-	public static List<GuildData> getGuilds(final DashboardSession dashboardSession) throws IOException{
+	public static List<GuildData> getGuilds(final DashboardSession dashboardSession) throws IOException, HttpException{
 		var userId = dashboardSession.getUserId();
 		var userGuilds = USER_GUILD_CACHE.get(userId);
 		if(userGuilds == null || userGuilds.isEmpty()){

src/main/java/de/kittybot/kittybot/commands/utilities/RestrictEmoteCommand.java

@@ -0,0 +1,39 @@
+package de.kittybot.kittybot.commands.utilities;
+
+import de.kittybot.kittybot.objects.command.ACommand;
+import de.kittybot.kittybot.objects.command.Category;
+import de.kittybot.kittybot.objects.command.CommandContext;
+import net.dv8tion.jda.api.Permission;
+
+import java.util.HashSet;
+
+
+public class RestrictEmoteCommand extends ACommand{
+
+	public static final String COMMAND = "restrictemote";
+	public static final String USAGE = "restrictemote <:Emote:, @Role, ...>";
+	public static final String DESCRIPTION = "Restricts a given emote to one or more roles";
+	protected static final String[] ALIASES = {"restricte", "remote", "re"};
+	protected static final Category CATEGORY = Category.UTILITIES;
+
+	public RestrictEmoteCommand(){
+		super(COMMAND, USAGE, DESCRIPTION, ALIASES, CATEGORY);
+	}
+
+	@Override
+	public void run(CommandContext ctx){
+		var emotes = ctx.getMessage().getEmotes();
+		var roles = ctx.getMentionedRoles();
+		if(emotes.isEmpty() || roles.isEmpty()){
+			sendUsage(ctx);
+			return;
+		}
+		if(!ctx.getSelfMember().hasPermission(Permission.MANAGE_EMOTES)){
+			sendError(ctx, "I can't manage emotes due to lack of permissions. Please give me the `MANAGE_EMOTES` permission to use this command.");
+			return;
+		}
+		var emote = emotes.get(0);
+		emote.getManager().setRoles(new HashSet<>(roles)).queue(success -> sendSuccess(ctx, "Successfully set roles"), error -> sendError(ctx, "Failed to set roles.\nPlease try again or report this in our discord"));
+	}
+
+}