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

fix button interactions

Browse Source
This commit is contained in:
Lee 2024-07-04 15:51:50 +01:00
parent c78033f409
commit 0e781f3d9a
7 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cc/fascinated/bat/features/drag/listeners/request/RequestListener.java
View File

@ -20,6 +20,9 @@ import java.util.Optional;
public class RequestListener implements EventListener {
@Override
public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) {
if (guild == null) {
return;
}
if (!event.getComponentId().equals("drag-request-cancel")) {
return;
}

3
src/main/java/cc/fascinated/bat/features/drag/listeners/request/TargetChannelListener.java
View File

@ -19,6 +19,9 @@ import org.springframework.stereotype.Component;
public class TargetChannelListener implements EventListener {
@Override
public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) {
if (guild == null) {
return;
}
User buttonUser = event.getUser();
Member member = guild.getDiscordGuild().getMember(buttonUser);
if (member == null) return;

3
src/main/java/cc/fascinated/bat/features/spotify/command/CurrentSubCommand.java
View File

@ -48,6 +48,9 @@ public class CurrentSubCommand extends BatCommand implements EventListener {
@Override @SneakyThrows
public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) {
if (guild == null) {
return;
}
if (!event.getUser().getId().equals(user.getId())) {
throw new BatException("%s You cannot interact with this message.".formatted(Emojis.CROSS_MARK_EMOJI));
}

3
src/main/java/cc/fascinated/bat/features/spotify/command/LinkSubCommand.java
View File

@ -65,6 +65,9 @@ public class LinkSubCommand extends BatCommand implements EventListener {
@Override
public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) {
if (guild == null) {
return;
}
if (!event.getComponentId().equals("spotify_link")) {
return;
}

3
src/main/java/cc/fascinated/bat/features/tmdb/command/MovieSubCommand.java
View File

@ -106,6 +106,9 @@ public class MovieSubCommand extends BatCommand implements EventListener {
@Override
public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) {
if (guild == null) {
return;
}
Map<String, String> params = userCommands.get(user.getId());
if (params == null) {
return;

3
src/main/java/cc/fascinated/bat/features/tmdb/command/SeriesSubCommand.java
View File

@ -103,6 +103,9 @@ public class SeriesSubCommand extends BatCommand implements EventListener {
@Override
public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) {
if (guild == null) {
return;
}
Map<String, String> params = userCommands.get(user.getId());
if (params == null) {
return;

6
src/main/java/cc/fascinated/bat/service/EventService.java
View File

@ -141,7 +141,7 @@ public class EventService extends ListenerAdapter {
if (event.getUser().isBot()) {
return;
}
BatGuild guild = event.getGuild() != null ? guildService.getGuild(event.getGuild().getId()) : null;
BatGuild guild = event.getGuild() == null ? null : guildService.getGuild(event.getGuild().getId());
BatUser user = userService.getUser(event.getUser().getId(), event.getUser());
for (EventListener listener : LISTENERS) {
@ -154,7 +154,7 @@ public class EventService extends ListenerAdapter {
if (event.getUser().isBot()) {
return;
}
BatGuild guild = event.getGuild() != null ? guildService.getGuild(event.getGuild().getId()) : null;
BatGuild guild = event.getGuild() == null ? null : guildService.getGuild(event.getGuild().getId());
BatUser user = userService.getUser(event.getUser().getId(), event.getUser());
try {
@ -172,7 +172,7 @@ public class EventService extends ListenerAdapter {
if (event.getUser().isBot()) {
return;
}
BatGuild guild = event.getGuild() != null ? guildService.getGuild(event.getGuild().getId()) : null;
BatGuild guild = event.getGuild() == null ? null : guildService.getGuild(event.getGuild().getId());
BatUser user = userService.getUser(event.getUser().getId(), event.getUser());
try {