Skip to content

Commit 6b1c4f2

Browse files
added check for MessageType.THREAD_CREATED
1 parent 23ade16 commit 6b1c4f2

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/main/java/com/javadiscord/javabot/events/SuggestionListener.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.javadiscord.javabot.other.Constants;
55
import net.dv8tion.jda.api.EmbedBuilder;
66
import net.dv8tion.jda.api.entities.Message;
7+
import net.dv8tion.jda.api.entities.MessageType;
78
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
89
import net.dv8tion.jda.api.hooks.ListenerAdapter;
910

@@ -13,38 +14,34 @@ public class SuggestionListener extends ListenerAdapter {
1314

1415
@Override
1516
public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
16-
try { if (event.getMember().getUser().isBot() || event.getMember() == null) return; }
17-
catch (NullPointerException ignored) { return; }
17+
if (event.getAuthor().isBot() || event.getAuthor().isSystem()
18+
|| event.getMessage().getType() == MessageType.THREAD_CREATED) return;
1819

19-
if (event.getChannel().equals(Bot.config.get(event.getGuild()).getModeration().getSuggestionChannel())) {
20+
if (!event.getChannel().equals(
21+
Bot.config.get(event.getGuild()).getModeration().getSuggestionChannel())) return;
2022

21-
EmbedBuilder eb = new EmbedBuilder()
23+
var eb = new EmbedBuilder()
2224
.setColor(Constants.GRAY)
2325
.setImage(null)
2426
.setAuthor(event.getAuthor().getAsTag() + " · Suggestion", null, event.getAuthor().getEffectiveAvatarUrl())
2527
.setTimestamp(new Date().toInstant())
26-
.setDescription(event.getMessage().getContentRaw());
28+
.setDescription(event.getMessage().getContentRaw())
29+
.build();
2730

2831
if (!event.getMessage().getAttachments().isEmpty()) {
2932
Message.Attachment attachment = event.getMessage().getAttachments().get(0);
30-
3133
try {
32-
event.getChannel().sendFile(attachment.retrieveInputStream().get(), "attachment." + attachment.getFileExtension()).setEmbeds(eb.build()).queue(message -> {
34+
event.getChannel().sendFile(attachment.retrieveInputStream().get(), "attachment." + attachment.getFileExtension()).setEmbeds(eb).queue(message -> {
3335
message.addReaction(Constants.REACTION_UPVOTE).queue();
3436
message.addReaction(Constants.REACTION_DOWNVOTE).queue();
3537
});
36-
3738
} catch (Exception e) { event.getChannel().sendMessage(e.getMessage()).queue(); }
38-
3939
} else {
40-
41-
event.getChannel().sendMessageEmbeds(eb.build()).queue(message -> {
40+
event.getChannel().sendMessageEmbeds(eb).queue(message -> {
4241
message.addReaction(Constants.REACTION_UPVOTE).queue();
4342
message.addReaction(Constants.REACTION_DOWNVOTE).queue();
4443
});
4544
}
46-
4745
event.getMessage().delete().queue();
48-
}
4946
}
5047
}

0 commit comments

Comments
 (0)