11package net .javadiscord .javabot .systems .moderation .report ;
22
3+ import net .javadiscord .javabot .util .UserUtils ;
34import xyz .dynxsty .dih4jda .util .ComponentIdBuilder ;
45import xyz .dynxsty .dih4jda .interactions .components .ButtonHandler ;
56import xyz .dynxsty .dih4jda .interactions .components .ModalHandler ;
@@ -56,7 +57,7 @@ public void handleButton(@NotNull ButtonInteractionEvent event, Button button) {
5657 return ;
5758 }
5859 Responses .info (event .getHook (), "Report resolved" , "Successfully resolved this report!" ).queue ();
59- event .getMessage ().editMessageComponents (ActionRow .of (Button .secondary ("report-resolved" , "Resolved by " + event .getUser (). getAsTag ( )).asDisabled ())).queue ();
60+ event .getMessage ().editMessageComponents (ActionRow .of (Button .secondary ("report-resolved" , "Resolved by " + UserUtils . getUserTag ( event .getUser ())).asDisabled ())).queue ();
6061 thread .sendMessage ("This thread was resolved by " + event .getUser ().getAsMention ()).queue (
6162 success -> thread .getManager ()
6263 .setName (String .format ("[Resolved] %s" , thread .getName ()))
@@ -86,7 +87,7 @@ protected Modal buildUserReportModal(@NotNull UserContextInteractionEvent event)
8687 TextInput messageInput = TextInput .create ("reason" , "Report Description" , TextInputStyle .PARAGRAPH )
8788 .setMaxLength (MessageEmbed .VALUE_MAX_LENGTH )
8889 .build ();
89- String title = "Report " + event .getTarget (). getAsTag ( );
90+ String title = "Report " + UserUtils . getUserTag ( event .getTarget ());
9091 return Modal .create (ComponentIdBuilder .build ("report" , "user" , event .getTarget ().getId ()), title .substring (0 , Math .min (title .length (), Modal .MAX_TITLE_LENGTH )))
9192 .addActionRows (ActionRow .of (messageInput ))
9293 .build ();
@@ -103,7 +104,7 @@ protected Modal buildMessageReportModal(@NotNull MessageContextInteractionEvent
103104 String title = "Report message" ;
104105 Member targetMember = event .getTarget ().getMember ();
105106 if (targetMember != null ) {
106- title += " from " + targetMember .getUser (). getAsTag ( );
107+ title += " from " + UserUtils . getUserTag ( targetMember .getUser ());
107108 }
108109 TextInput messageInput = TextInput .create ("reason" , "Report Description" , TextInputStyle .PARAGRAPH )
109110 .setMaxLength (MessageEmbed .VALUE_MAX_LENGTH )
@@ -136,7 +137,7 @@ protected WebhookMessageCreateAction<Message> handleUserReport(InteractionHook h
136137 }
137138 reportChannel .sendMessageEmbeds (embed .build ())
138139 .queue (m -> this .createReportThread (m , target .getIdLong (), config .getModerationConfig ()));
139- embed .setDescription ("Successfully reported " + "`" + target . getAsTag ( ) + "`!\n Your report has been send to our Moderators" );
140+ embed .setDescription ("Successfully reported " + "`" + UserUtils . getUserTag ( target ) + "`!\n Your report has been send to our Moderators" );
140141 hook .sendMessageEmbeds (embed .build ()).queue ();
141142 }, failure -> {
142143 Responses .error (hook , "The user to report seems not to exist any more." ).queue ();
@@ -162,7 +163,7 @@ private void handleMessageReport(ModalInteractionEvent event, String messageId)
162163 WebhookUtil .mirrorMessageToWebhook (wh , target , target .getContentRaw (), thread .getIdLong (), null , null );
163164 });
164165 }));
165- embed .setDescription ("Successfully reported " + "`" + target .getAuthor (). getAsTag ( ) + "`!\n Your report has been send to our Moderators" );
166+ embed .setDescription ("Successfully reported " + "`" + UserUtils . getUserTag ( target .getAuthor ()) + "`!\n Your report has been send to our Moderators" );
166167 event .getHook ().sendMessageEmbeds (embed .build ()).queue ();
167168 }, failure -> {
168169 Responses .error (event .getHook (), "The author of the message to report seems not to exist any more." ).queue ();
@@ -201,15 +202,15 @@ private void createReportThread(Message message, long targetId, ModerationConfig
201202
202203 private EmbedBuilder buildReportEmbed (User reported , User reportedBy , String reason , Channel channel ) {
203204 return new EmbedBuilder ()
204- .setAuthor (reported . getAsTag ( ), null , reported .getEffectiveAvatarUrl ())
205+ .setAuthor (UserUtils . getUserTag ( reported ), null , reported .getEffectiveAvatarUrl ())
205206 .setColor (Responses .Type .DEFAULT .getColor ())
206207 .addField ("Member" , reported .getAsMention (), true )
207208 .addField ("Reported by" , reportedBy .getAsMention (), true )
208209 .addField ("Channel" , channel .getAsMention (), true )
209210 .addField ("Reported on" , String .format ("<t:%s:F>" , Instant .now ().getEpochSecond ()), false )
210211 .addField ("ID" , String .format ("``` %s ```" , reported .getId ()), true )
211212 .addField ("Reason" , String .format ("``` %s ```" , reason ), false )
212- .setFooter (reportedBy . getAsTag ( ), reportedBy .getEffectiveAvatarUrl ())
213+ .setFooter (UserUtils . getUserTag ( reportedBy ), reportedBy .getEffectiveAvatarUrl ())
213214 .setTimestamp (Instant .now ());
214215 }
215216}
0 commit comments