mirror of
https://github.com/DreamExposure/DisCal-Discord-Bot.git
synced 2026-05-08 02:10:05 -05:00
Debugging guild get endpoint taking too long to execute
Rewrote a whole ton of the permissions checking so that it should run faster. Hopefully this helps speed up the guild get endpoint significantly
This commit is contained in:
NovaFox161
@@ -37,8 +37,8 @@ public class GuildUtils {
|
||||
Member m = g.getMemberById(Snowflake.of(userId)).block();
|
||||
|
||||
WebGuild wg = new WebGuild().fromGuild(g);
|
||||
wg.setManageServer(PermissionChecker.hasManageServerRole(m));
|
||||
wg.setDiscalRole(PermissionChecker.hasSufficientRole(g, m));
|
||||
wg.setManageServer(PermissionChecker.hasManageServerRole(m).blockOptional().orElse(false));
|
||||
wg.setDiscalRole(PermissionChecker.hasSufficientRole(m, wg.getSettings()).blockOptional().orElse(false));
|
||||
guilds.add(wg);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
package org.dreamexposure.discal.core.utils;
|
||||
|
||||
import org.dreamexposure.discal.core.database.DatabaseManager;
|
||||
import org.dreamexposure.discal.core.logger.Logger;
|
||||
import org.dreamexposure.discal.core.object.BotSettings;
|
||||
import org.dreamexposure.discal.core.object.GuildSettings;
|
||||
|
||||
import discord4j.core.event.domain.message.MessageCreateEvent;
|
||||
import discord4j.core.object.entity.Guild;
|
||||
import discord4j.core.object.entity.GuildChannel;
|
||||
import discord4j.core.object.entity.Channel;
|
||||
import discord4j.core.object.entity.Member;
|
||||
import discord4j.core.object.entity.Role;
|
||||
import discord4j.core.object.util.Permission;
|
||||
import discord4j.core.object.util.PermissionSet;
|
||||
import discord4j.core.object.util.Snowflake;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
@@ -19,7 +16,6 @@ import reactor.core.publisher.Mono;
|
||||
* Website: www.cloudcraftgaming.com
|
||||
* For Project: DisCal
|
||||
*/
|
||||
@SuppressWarnings({"ConstantConditions", "OptionalGetWithoutIsPresent"})
|
||||
public class PermissionChecker {
|
||||
/**
|
||||
* Checks if the user who sent the received message has the proper role to use a command.
|
||||
@@ -27,119 +23,40 @@ public class PermissionChecker {
|
||||
* @param event The Event received to check for the user and guild.
|
||||
* @return <code>true</code> if the user has the proper role, otherwise <code>false</code>.
|
||||
*/
|
||||
public static boolean hasSufficientRole(MessageCreateEvent event) {
|
||||
//TODO: Figure out exactly what is causing a NPE here...
|
||||
try {
|
||||
GuildSettings settings = DatabaseManager.getManager().getSettings(event.getGuild().block().getId());
|
||||
if (!settings.getControlRole().equalsIgnoreCase("everyone")) {
|
||||
Member sender = event.getMember().get();
|
||||
Guild guild = event.getGuild().block();
|
||||
String roleId = settings.getControlRole();
|
||||
Role role = guild
|
||||
.getRoleById(Snowflake.of(roleId))
|
||||
.onErrorResume(e -> Mono.empty())
|
||||
.block();
|
||||
public static Mono<Boolean> hasSufficientRole(MessageCreateEvent event, GuildSettings settings) {
|
||||
if (settings.getControlRole().equalsIgnoreCase("everyone"))
|
||||
return Mono.just(true);
|
||||
|
||||
if (role != null) {
|
||||
int pos = role.getPosition().block();
|
||||
for (Role r : sender.getRoles().collectList().block()) {
|
||||
if (r.getId().asString().equals(role.getId().asString()) || r.getPosition().block() > pos)
|
||||
return true;
|
||||
return Mono.justOrEmpty(event.getMember())
|
||||
.flatMapMany(Member::getRoles)
|
||||
.map(Role::getId)
|
||||
.any(snowflake -> snowflake.equals(Snowflake.of(settings.getControlRole())));
|
||||
|
||||
}
|
||||
return false;
|
||||
} else {
|
||||
//Role not found... reset Db...
|
||||
settings.setControlRole("everyone");
|
||||
DatabaseManager.getManager().updateSettings(settings);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
//Something broke so we will harmlessly allow access and alert the dev.
|
||||
Logger.getLogger().exception(event.getMessage().getAuthor().get(), "Failed to check for sufficient control role.", e, true, PermissionChecker.class);
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static boolean hasSufficientRole(Guild guild, Member member) {
|
||||
//TODO: Figure out exactly what is causing a NPE here...
|
||||
try {
|
||||
GuildSettings settings = DatabaseManager.getManager().getSettings(guild.getId());
|
||||
if (!settings.getControlRole().equalsIgnoreCase("everyone")) {
|
||||
public static Mono<Boolean> hasSufficientRole(Member member, GuildSettings settings) {
|
||||
if (settings.getControlRole().equalsIgnoreCase("everyone"))
|
||||
return Mono.just(true);
|
||||
|
||||
String roleId = settings.getControlRole();
|
||||
Role role = guild
|
||||
.getRoleById(Snowflake.of(roleId))
|
||||
.onErrorResume(e -> Mono.empty())
|
||||
.block();
|
||||
|
||||
if (role != null) {
|
||||
int pos = role.getPosition().block();
|
||||
|
||||
for (Role r : member.getRoles().collectList().block()) {
|
||||
if (r.getId().equals(role.getId()) || r.getPosition().block() > pos)
|
||||
return true;
|
||||
|
||||
}
|
||||
return false;
|
||||
} else {
|
||||
//Role not found... reset Db...
|
||||
settings.setControlRole("everyone");
|
||||
DatabaseManager.getManager().updateSettings(settings);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
//Something broke so we will harmlessly allow access and notify the dev team
|
||||
Logger.getLogger().exception(member, "Failed to check for sufficient control role.", e, true, PermissionChecker.class);
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
return Mono.from(member.getRoles()
|
||||
.map(Role::getId)
|
||||
.any(snowflake -> snowflake.equals(Snowflake.of(settings.getControlRole())))
|
||||
);
|
||||
}
|
||||
|
||||
public static boolean hasSufficientRole(Guild guild, Member member, GuildSettings settings) {
|
||||
try {
|
||||
if (!settings.getControlRole().equalsIgnoreCase("everyone")) {
|
||||
|
||||
String roleId = settings.getControlRole();
|
||||
Role role = guild
|
||||
.getRoleById(Snowflake.of(roleId))
|
||||
.onErrorResume(e -> Mono.empty())
|
||||
.block();
|
||||
|
||||
if (role != null) {
|
||||
int pos = role.getPosition().block();
|
||||
|
||||
for (Role r : member.getRoles().collectList().block()) {
|
||||
if (r.getId().equals(role.getId()) || r.getPosition().block() > pos)
|
||||
return true;
|
||||
|
||||
}
|
||||
return false;
|
||||
} else {
|
||||
//Role not found... reset Db...
|
||||
settings.setControlRole("everyone");
|
||||
DatabaseManager.getManager().updateSettings(settings);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
//Something broke so we will harmlessly allow access and notify the dev team
|
||||
Logger.getLogger().exception(member, "Failed to check for sufficient control role.", e, true, PermissionChecker.class);
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
public static Mono<Boolean> hasManageServerRole(MessageCreateEvent event) {
|
||||
return Mono.justOrEmpty(event.getMember())
|
||||
.flatMap(Member::getBasePermissions)
|
||||
.map(perms -> perms.contains(Permission.MANAGE_GUILD)
|
||||
|| perms.contains(Permission.ADMINISTRATOR))
|
||||
.defaultIfEmpty(false);
|
||||
}
|
||||
|
||||
public static boolean hasManageServerRole(MessageCreateEvent event) {
|
||||
return event.getMessage().getAuthor().get().asMember(event.getGuildId().get()).block().getBasePermissions().block().contains(Permission.MANAGE_GUILD);
|
||||
}
|
||||
|
||||
public static boolean hasManageServerRole(Member m) {
|
||||
PermissionSet perms = m.getBasePermissions().block();
|
||||
return (perms.contains(Permission.MANAGE_GUILD) || perms.contains(Permission.ADMINISTRATOR));
|
||||
public static Mono<Boolean> hasManageServerRole(Member m) {
|
||||
return m.getBasePermissions()
|
||||
.map(perms -> perms.contains(Permission.MANAGE_GUILD)
|
||||
|| perms.contains(Permission.ADMINISTRATOR)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -148,37 +65,22 @@ public class PermissionChecker {
|
||||
* @param event The event received to check for the correct channel.
|
||||
* @return <code>true</code> if in correct channel, otherwise <code>false</code>.
|
||||
*/
|
||||
public static boolean isCorrectChannel(MessageCreateEvent event) {
|
||||
try {
|
||||
GuildSettings settings = DatabaseManager.getManager().getSettings(event.getGuild().block().getId());
|
||||
if (settings.getDiscalChannel().equalsIgnoreCase("all"))
|
||||
return true;
|
||||
public static Mono<Boolean> isCorrectChannel(MessageCreateEvent event, GuildSettings settings) {
|
||||
if (settings.getDiscalChannel().equalsIgnoreCase("all"))
|
||||
return Mono.just(true);
|
||||
|
||||
|
||||
GuildChannel channel = null;
|
||||
for (GuildChannel c : event.getMessage().getGuild().block().getChannels().toIterable()) {
|
||||
if (c.getId().asString().equals(settings.getDiscalChannel())) {
|
||||
channel = c;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (channel != null)
|
||||
return event.getMessage().getChannel().block().getId().equals(channel.getId());
|
||||
|
||||
|
||||
//If we got here, the channel no longer exists, reset data and return true.
|
||||
settings.setDiscalChannel("all");
|
||||
DatabaseManager.getManager().updateSettings(settings);
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
//Catch any errors so that the bot always responds...
|
||||
Logger.getLogger().exception(event.getMember().get(), "Failed to check for discal channel.", e, true, PermissionChecker.class);
|
||||
return true;
|
||||
}
|
||||
return Mono.from(event.getMessage().getChannel()
|
||||
.map(Channel::getId)
|
||||
.map(snowflake -> snowflake.equals(Snowflake.of(settings.getDiscalChannel())))
|
||||
.onErrorResume(e -> Mono.just(true)) //If channel not found, allow.
|
||||
);
|
||||
}
|
||||
|
||||
public static boolean botHasMessageManagePerms(MessageCreateEvent event) {
|
||||
return event.getGuild().flatMap(guild -> guild.getMemberById(event.getClient().getSelfId().get())).block().getBasePermissions().block().contains(Permission.MANAGE_MESSAGES);
|
||||
public static Mono<Boolean> botHasMessageManagePerms(MessageCreateEvent event) {
|
||||
return event.getGuild()
|
||||
.flatMap(guild -> guild.getMemberById(Snowflake.of(BotSettings.ID.get()))
|
||||
.flatMap(Member::getBasePermissions)
|
||||
.map(perms -> perms.contains(Permission.MANAGE_MESSAGES))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user