okNick/Bat
1
0
Fork 0
forked from Fascinated/Bat
Code Pull Requests Activity

fix dm commands fr this time

Browse Source
This commit is contained in:
Lee
2024-06-26 00:41:47 +01:00
parent 33ff4686f3
commit bf12fb1914
16 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/cc/fascinated/bat/service/CommandService.java
View File

@ -11,8 +11,10 @@ import lombok.extern.log4j.Log4j2;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.internal.entities.channel.concrete.PrivateChannelImpl;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
@ -89,8 +91,9 @@ public class CommandService extends ListenerAdapter {
@Override
public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
log.info("piss sticks");
Guild discordGuild = event.getGuild();
if (event.getUser().isBot() || event.getMember() == null) {
if (event.getUser().isBot()) {
return;
}
@ -130,7 +133,7 @@ public class CommandService extends ListenerAdapter {
}
// Check if the user has the required permissions
if (discordGuild != null) {
if (discordGuild != null && event.getMember() != null) {
List<Permission> missingPermissions = new ArrayList<>();
for (Permission permission : requiredPermissions) {
if (!event.getMember().hasPermission(permission)) {
@ -144,8 +147,8 @@ public class CommandService extends ListenerAdapter {
return;
}
}
executor.execute(guild, user, event.getChannel().asTextChannel(), event.getMember(), event.getInteraction());
executor.execute(guild, user, guild != null ? event.getChannel().asTextChannel() : event.getChannel().asPrivateChannel(),
event.getMember(), event.getInteraction());
} catch (Exception ex) {
log.error("An error occurred while executing command \"{}\"", commandName, ex);