Skip to content

Commit 620019f

Browse files
Update deleteMessages and deleteMessagesByIds to actually return AuditableRestAction
1 parent 9029bb4 commit 620019f

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/main/java/net/dv8tion/jda/api/entities/channel/middleman/GuildMessageChannel.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
3131
import net.dv8tion.jda.api.exceptions.MissingAccessException;
3232
import net.dv8tion.jda.api.requests.RestAction;
33+
import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
3334
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
3435
import net.dv8tion.jda.internal.utils.Checks;
3536

@@ -236,7 +237,7 @@ default RestAction<Void> removeReactionById(long messageId, @Nonnull Emoji emoji
236237
*/
237238
@Nonnull
238239
@CheckReturnValue
239-
default RestAction<Void> deleteMessages(@Nonnull Collection<Message> messages) {
240+
default AuditableRestAction<Void> deleteMessages(@Nonnull Collection<Message> messages) {
240241
Checks.notEmpty(messages, "Messages collection");
241242

242243
return deleteMessagesByIds(messages.stream().map(ISnowflake::getId).collect(Collectors.toList()));
@@ -292,7 +293,7 @@ default RestAction<Void> deleteMessages(@Nonnull Collection<Message> messages) {
292293
*/
293294
@Nonnull
294295
@CheckReturnValue
295-
RestAction<Void> deleteMessagesByIds(@Nonnull Collection<String> messageIds);
296+
AuditableRestAction<Void> deleteMessagesByIds(@Nonnull Collection<String> messageIds);
296297

297298
/**
298299
* Attempts to remove all reactions from a message with the specified {@code messageId} in this TextChannel

src/main/java/net/dv8tion/jda/internal/entities/channel/mixin/middleman/GuildMessageChannelMixin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import net.dv8tion.jda.api.entities.sticker.StickerSnowflake;
2525
import net.dv8tion.jda.api.requests.RestAction;
2626
import net.dv8tion.jda.api.requests.Route;
27+
import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
2728
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
2829
import net.dv8tion.jda.api.utils.MiscUtil;
2930
import net.dv8tion.jda.api.utils.TimeUtil;
@@ -43,7 +44,7 @@ public interface GuildMessageChannelMixin<T extends GuildMessageChannelMixin<T>>
4344
@Override
4445
@Nonnull
4546
@CheckReturnValue
46-
default RestAction<Void> deleteMessagesByIds(@Nonnull Collection<String> messageIds) {
47+
default AuditableRestAction<Void> deleteMessagesByIds(@Nonnull Collection<String> messageIds) {
4748
checkCanAccess();
4849
checkPermission(
4950
Permission.MESSAGE_MANAGE,

src/main/java/net/dv8tion/jda/internal/entities/channel/mixin/middleman/MessageChannelMixin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import net.dv8tion.jda.api.utils.messages.MessagePollData;
4545
import net.dv8tion.jda.internal.entities.channel.mixin.ChannelMixin;
4646
import net.dv8tion.jda.internal.requests.RestActionImpl;
47+
import net.dv8tion.jda.internal.requests.restaction.AuditableRestActionImpl;
4748

4849
import java.util.*;
4950
import java.util.concurrent.CompletableFuture;
@@ -380,9 +381,9 @@ default MessageEditAction editMessageAttachmentsById(
380381
boolean canDeleteOtherUsersMessages();
381382

382383
// ---- Helpers -----
383-
default RestActionImpl<Void> bulkDeleteMessages(Collection<String> messageIds) {
384+
default AuditableRestActionImpl<Void> bulkDeleteMessages(Collection<String> messageIds) {
384385
DataObject body = DataObject.empty().put("messages", messageIds);
385386
Route.CompiledRoute route = Route.Messages.DELETE_MESSAGES.compile(getId());
386-
return new RestActionImpl<>(getJDA(), route, body);
387+
return new AuditableRestActionImpl<>(getJDA(), route, body);
387388
}
388389
}

0 commit comments

Comments
 (0)