44import com .javadiscord .javabot .other .Constants ;
55import net .dv8tion .jda .api .EmbedBuilder ;
66import net .dv8tion .jda .api .entities .Message ;
7+ import net .dv8tion .jda .api .entities .MessageType ;
78import net .dv8tion .jda .api .events .message .guild .GuildMessageReceivedEvent ;
89import 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