Skip to content

Commit 8f9102a

Browse files
authored
fixed thread creation warns in media only channels (#556)
1 parent 2fa1b8f commit 8f9102a

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

application/src/main/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListener.java

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import net.dv8tion.jda.api.MessageBuilder;
55
import net.dv8tion.jda.api.entities.Message;
66
import net.dv8tion.jda.api.entities.MessageEmbed;
7+
import net.dv8tion.jda.api.entities.MessageType;
78
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
89
import net.dv8tion.jda.api.requests.RestAction;
9-
import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
1010
import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
1111
import org.togetherjava.tjbot.config.Config;
1212

@@ -37,27 +37,23 @@ public void onMessageReceived(MessageReceivedEvent event) {
3737
return;
3838
}
3939

40-
if (messageHasNoMediaAttached(event)) {
41-
deleteMessage(event).flatMap(any -> dmUser(event)).queue();
40+
Message message = event.getMessage();
41+
if (message.getType() == MessageType.THREAD_CREATED) {
42+
return;
43+
}
44+
45+
if (messageHasNoMediaAttached(message)) {
46+
message.delete().flatMap(any -> dmUser(message)).queue();
4247
}
4348
}
4449

45-
private static boolean messageHasNoMediaAttached(MessageReceivedEvent event) {
46-
Message message = event.getMessage();
50+
private boolean messageHasNoMediaAttached(Message message) {
4751
return message.getAttachments().isEmpty() && message.getEmbeds().isEmpty()
4852
&& !message.getContentRaw().contains("http");
4953
}
5054

51-
private AuditableRestAction<Void> deleteMessage(MessageReceivedEvent event) {
52-
return event.getMessage().delete();
53-
}
54-
55-
private RestAction<Message> dmUser(MessageReceivedEvent event) {
56-
return dmUser(event.getMessage());
57-
}
58-
59-
private RestAction<Message> dmUser(Message originalMessage) {
60-
String originalMessageContent = originalMessage.getContentRaw();
55+
private RestAction<Message> dmUser(Message message) {
56+
String originalMessageContent = message.getContentRaw();
6157
MessageEmbed originalMessageEmbed =
6258
new EmbedBuilder().setDescription(originalMessageContent)
6359
.setColor(Color.ORANGE)
@@ -68,7 +64,7 @@ private RestAction<Message> dmUser(Message originalMessage) {
6864
.setEmbeds(originalMessageEmbed)
6965
.build();
7066

71-
return originalMessage.getAuthor()
67+
return message.getAuthor()
7268
.openPrivateChannel()
7369
.flatMap(channel -> channel.sendMessage(dmMessage));
7470
}

0 commit comments

Comments
 (0)