Skip to content

Commit 669e4bb

Browse files
committed
Remove a lot of text channel references
1 parent 8cc7bfa commit 669e4bb

26 files changed

+86
-53
lines changed

bot/src/main/java/ml/duncte123/skybot/CommandManager.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
import ml.duncte123.skybot.utils.MapUtils;
6363
import net.dv8tion.jda.api.EmbedBuilder;
6464
import net.dv8tion.jda.api.entities.Guild;
65-
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
65+
import net.dv8tion.jda.api.entities.channel.attribute.IAgeRestrictedChannel;
66+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
67+
import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
6668
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
6769
import net.dv8tion.jda.api.exceptions.ErrorHandler;
6870
import net.dv8tion.jda.api.utils.data.DataObject;
@@ -458,7 +460,7 @@ public void dispatchCommand(@Nonnull ICommand<?> cmd, String invoke, List<String
458460
MDC.put("guild", event.getGuild().toString());
459461
setJDAContext(event.getJDA());
460462

461-
final TextChannel channel = event.getChannel().asTextChannel();
463+
final MessageChannel channel = event.getChannel();
462464

463465
if (!channel.canTalk()) {
464466
return;
@@ -485,8 +487,12 @@ public void dispatchCommand(@Nonnull ICommand<?> cmd, String invoke, List<String
485487
}
486488

487489
private boolean isSafeForWork(MessageReceivedEvent event) {
488-
if (event.getChannel().asTextChannel().isNSFW()) {
489-
return false;
490+
final MessageChannelUnion channel = event.getChannel();
491+
492+
if (channel instanceof IAgeRestrictedChannel nsfwChannel) {
493+
if (nsfwChannel.isNSFW()) {
494+
return false;
495+
}
490496
}
491497

492498
final Guild.NSFWLevel nsfwLevel = event.getGuild().getNSFWLevel();

bot/src/main/java/ml/duncte123/skybot/commands/fun/ExplosmCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public ExplosmCommand() {
4545

4646
@Override
4747
public void execute(@NotNull CommandContext ctx) {
48-
if (!ctx.getChannel().asTextChannel().isNSFW()) {
48+
if (!ctx.isChannelNSFW()) {
4949
sendMsg(ctx, "Due to the nature of explosm comics this command is restricted to nsfw channels");
5050
return;
5151
}

bot/src/main/java/ml/duncte123/skybot/commands/fun/LoveCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import net.dv8tion.jda.api.EmbedBuilder;
2929
import net.dv8tion.jda.api.Permission;
3030
import net.dv8tion.jda.api.entities.Member;
31-
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
31+
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
3232
import net.dv8tion.jda.api.utils.FileUpload;
3333

3434
import javax.annotation.Nonnull;
@@ -103,7 +103,7 @@ public void execute(@Nonnull CommandContext ctx) {
103103
)*/
104104
.addField(response.get("score").asText(), response.get("message").asText(), false);
105105

106-
final TextChannel channel = ctx.getChannel().asTextChannel();
106+
final GuildMessageChannel channel = ctx.getChannel().asGuildMessageChannel();
107107

108108
if (ctx.getSelfMember().hasPermission(channel, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_EMBED_LINKS)) {
109109
ctx.getWeebApi().generateLoveship(

bot/src/main/java/ml/duncte123/skybot/commands/fun/TagCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ private void sendTagsList(CommandContext ctx) {
210210

211211
final Permission perm = Permission.MESSAGE_ATTACH_FILES;
212212

213-
if (!ctx.getSelfMember().hasPermission(ctx.getChannel().asTextChannel(), perm)) {
213+
if (!ctx.getSelfMember().hasPermission(ctx.getChannel().asGuildMessageChannel(), perm)) {
214214
sendMsg(ctx, "I need the `" + perm.getName() + "` permission for this command to work");
215215

216216
return;

bot/src/main/java/ml/duncte123/skybot/commands/guild/mod/AnnounceCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import net.dv8tion.jda.api.EmbedBuilder;
2828
import net.dv8tion.jda.api.Permission;
2929
import net.dv8tion.jda.api.entities.Message;
30-
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
30+
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
3131

3232
import javax.annotation.Nonnull;
3333
import java.util.List;
@@ -60,15 +60,15 @@ public AnnounceCommand() {
6060

6161
@Override
6262
public void execute(@Nonnull CommandContext ctx) {
63-
final List<TextChannel> mentioned = ctx.getMessage().getMentions().getChannels(TextChannel.class);
63+
final List<GuildMessageChannel> mentioned = ctx.getMessage().getMentions().getChannels(GuildMessageChannel.class);
6464

6565
if (mentioned.isEmpty()) {
6666
sendMsg(ctx, "You did not specify a channel, usage: " + this.getUsageInstructions(ctx));
6767

6868
return;
6969
}
7070

71-
final TextChannel targetChannel = mentioned.get(0);
71+
final GuildMessageChannel targetChannel = mentioned.get(0);
7272

7373
if (!targetChannel.canTalk()) {
7474
sendErrorWithMessage(ctx.getMessage(), "I can not talk in " + targetChannel.getAsMention());

bot/src/main/java/ml/duncte123/skybot/commands/guild/mod/BanCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void execute(@Nonnull CommandContext ctx) {
7272

7373
final Member toBanMember = mentioned.get(0);
7474

75-
if (!canInteract(ctx.getMember(), toBanMember, "ban", ctx.getChannel().asTextChannel())) {
75+
if (!canInteract(ctx.getMember(), toBanMember, "ban", ctx.getChannel())) {
7676
return;
7777
}
7878

bot/src/main/java/ml/duncte123/skybot/commands/guild/mod/CleanupCommand.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import ml.duncte123.skybot.utils.AirUtils;
2828
import net.dv8tion.jda.api.Permission;
2929
import net.dv8tion.jda.api.entities.Message;
30-
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
30+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
3131
import net.dv8tion.jda.api.exceptions.ErrorResponseException;
3232
import net.dv8tion.jda.api.requests.ErrorResponse;
3333
import net.dv8tion.jda.api.requests.Request;
@@ -117,7 +117,7 @@ public void execute(@Nonnull CommandContext ctx) {
117117
return;
118118
}
119119

120-
final TextChannel channel = ctx.getChannel().asTextChannel();
120+
final MessageChannel channel = ctx.getChannel();
121121
final var flags = ctx.getParsedFlags(this);
122122
final boolean keepPinned = flags.containsKey("keep-pinned");
123123
final boolean clearBots = flags.containsKey("bots-only");
@@ -161,7 +161,7 @@ private int getTotal(List<String> args, CommandContext ctx) {
161161
}
162162

163163
private int handleMessages(List<Message> msgs, boolean keepPinned, boolean clearBots, CommandContext ctx) {
164-
final TextChannel channel = ctx.getChannel().asTextChannel();
164+
final MessageChannel channel = ctx.getChannel();
165165
Stream<Message> msgStream = msgs.stream();
166166

167167
if (keepPinned) {
@@ -299,7 +299,7 @@ private CompletableFuture<Void> hackTimeout(CompletableFuture<Void> future) {
299299
return future;
300300
}
301301

302-
private void removeMessage(CommandContext ctx, TextChannel channel, CompletableFuture<Message> hack) {
302+
private void removeMessage(CommandContext ctx, MessageChannel channel, CompletableFuture<Message> hack) {
303303
try {
304304
final Message hacked = hack.get();
305305

bot/src/main/java/ml/duncte123/skybot/commands/guild/mod/KickCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void execute(@Nonnull CommandContext ctx) {
6868
final Member toKickMember = mentioned.get(0);
6969
final Member member = ctx.getMember();
7070

71-
if (!canInteract(member, toKickMember, "kick", ctx.getChannel().asTextChannel())) {
71+
if (!canInteract(member, toKickMember, "kick", ctx.getChannel())) {
7272
return;
7373
}
7474

bot/src/main/java/ml/duncte123/skybot/commands/guild/mod/PurgeUserCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import net.dv8tion.jda.api.Permission;
2424
import net.dv8tion.jda.api.entities.Member;
2525
import net.dv8tion.jda.api.entities.Message;
26-
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
2726
import net.dv8tion.jda.api.entities.User;
27+
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
2828

2929
import javax.annotation.Nonnull;
3030
import java.util.List;
@@ -67,7 +67,7 @@ public void execute(@Nonnull CommandContext ctx) {
6767

6868
final Member targetMember = mentionedMembers.get(0);
6969
final User targetUser = targetMember.getUser();
70-
final TextChannel channel = ctx.getChannel().asTextChannel();
70+
final GuildMessageChannel channel = ctx.getChannel().asGuildMessageChannel();
7171
final Message message = ctx.getMessage();
7272

7373
channel.getIterableHistory()

bot/src/main/java/ml/duncte123/skybot/commands/guild/mod/SoftbanCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void execute(@Nonnull CommandContext ctx) {
6767

6868
final Member toBanMember = mentioned.get(0);
6969

70-
if (!canInteract(ctx.getMember(), toBanMember, "softban", ctx.getChannel().asTextChannel())) {
70+
if (!canInteract(ctx.getMember(), toBanMember, "softban", ctx.getChannel())) {
7171
return;
7272
}
7373

0 commit comments

Comments
 (0)