Fascinated/Bat
1
1
Fork 2
Code Issues 1 Pull Requests Actions Activity

update original message
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 40s
Details

Browse Source
This commit is contained in:
Lee 2024-07-04 02:58:29 +01:00
parent 040846ef0a
commit 2fcc1b66c1
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -159,11 +159,6 @@
<artifactId>spotify-web-api-java</artifactId> <artifactId>spotify-web-api-java</artifactId>
<version>8.4.0</version> <version>8.4.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.1.8</version>
</dependency>
<dependency> <dependency>
<groupId>uk.co.conoregan</groupId> <groupId>uk.co.conoregan</groupId>
<artifactId>themoviedbapi</artifactId> <artifactId>themoviedbapi</artifactId>

8
src/main/java/cc/fascinated/bat/features/drag/command/RequestSubCommand.java
View File

@ -137,11 +137,9 @@ public class RequestSubCommand extends BatSubCommand implements EventListener {
Button.primary("drag-request-accept", "Accept"), Button.primary("drag-request-accept", "Accept"),
Button.danger("drag-request-decline", "Decline") Button.danger("drag-request-decline", "Decline")
)) ))
.queue(message -> { .queue(message -> JOIN_REQUESTS.stream()
JOIN_REQUESTS.stream() .filter(r -> r.getVoiceChannel().getId().equals(targetChannel.getId()))
.filter(r -> r.getVoiceChannel().getId().equals(targetChannel.getId())) .findFirst().ifPresent(request -> request.setRequestMessage(message)));
.findFirst().ifPresent(request -> request.setRequestMessage(message));
});
event.replyEmbeds(EmbedUtils.successEmbed() event.replyEmbeds(EmbedUtils.successEmbed()
.setDescription("Request to join %s's voice channel has been sent.".formatted(target.getAsMention())) .setDescription("Request to join %s's voice channel has been sent.".formatted(target.getAsMention()))
.build()) .build())

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

@ -28,7 +28,7 @@ public class RequestListener implements EventListener {
.findFirst(); .findFirst();
if (optionalDragRequest.isEmpty()) { if (optionalDragRequest.isEmpty()) {
event.replyEmbeds(EmbedUtils.errorEmbed() event.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You do not have a request to cancel.") .setDescription("%s, you do not have a request to cancel.".formatted(user.getDiscordUser().getAsMention()))
.build()).queue(); .build()).queue();
return; return;
} }

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

@ -31,6 +31,12 @@ public class TargetChannelListener implements EventListener {
if (event.getComponentId().equals("drag-request-accept")) { if (event.getComponentId().equals("drag-request-accept")) {
joinRequest.getVoiceChannel().getGuild().moveVoiceMember(joinRequest.getMember(), joinRequest.getVoiceChannel()).queue(); joinRequest.getVoiceChannel().getGuild().moveVoiceMember(joinRequest.getMember(), joinRequest.getVoiceChannel()).queue();
joinRequest.getInteractionHook().retrieveOriginal().queue(message -> {
message.editMessageEmbeds(EmbedUtils.successEmbed()
.setDescription("%s has accepted your request to join their voice channel!".formatted(joinRequest.getTarget().getAsMention()))
.build()).queue(then -> then.delete().queueAfter(10, java.util.concurrent.TimeUnit.SECONDS));
message.editMessageComponents().queue();
});
event.replyEmbeds(EmbedUtils.successEmbed() event.replyEmbeds(EmbedUtils.successEmbed()
.setDescription("You have accepted %s's request to join your voice channel!".formatted(joinRequest.getMember().getAsMention())) .setDescription("You have accepted %s's request to join your voice channel!".formatted(joinRequest.getMember().getAsMention()))
.build()) .build())