bug-fix transfer feature (#943)

* NPE was thrown if user had no avatar
* default avatar if user do not have one
* remove  unnecessary embed from warning message to user
* minor fixes

* refactor avatarUrl to be non-null

* revert back to drop changes in other files

* bug fixes

* embed fix for user warnings

* introduce variable for url suffix, prevents link preview

* minor fix

Author: ankitsmt211

application/src/main/java/org/togetherjava/tjbot/features/moderation/ModerationUtils.java

@@ -287,7 +287,10 @@ static MessageEmbed createActionResponse(User author, ModerationAction action, U
         if (reason != null && !reason.isBlank()) {
             description += "\n\nReason: " + reason;
         }
-        return new EmbedBuilder().setAuthor(author.getAsTag(), null, author.getAvatarUrl())
+
+        String avatarOrDefaultUrl = author.getEffectiveAvatarUrl();
+
+        return new EmbedBuilder().setAuthor(author.getAsTag(), null, avatarOrDefaultUrl)
             .setDescription(description)
             .setTimestamp(Instant.now())
             .setColor(AMBIENT_COLOR)

application/src/main/java/org/togetherjava/tjbot/features/moderation/ReportCommand.java

@@ -90,7 +90,7 @@ public void onMessageContext(MessageContextInteractionEvent event) {
         String reportedMessageJumpUrl = event.getTarget().getJumpUrl();
         String reportedMessageChannel = event.getTarget().getChannel().getId();
         String reportedAuthorName = event.getTarget().getAuthor().getName();
-        String reportedAuthorAvatarURL = event.getTarget().getAuthor().getAvatarUrl();
+        String reportedAuthorAvatarUrl = event.getTarget().getAuthor().getEffectiveAvatarUrl();
         String reportedAuthorID = event.getTarget().getAuthor().getId();
 
         TextInput modalTextInput = TextInput
@@ -102,7 +102,7 @@ public void onMessageContext(MessageContextInteractionEvent event) {
 
         String reportModalComponentID = generateComponentId(reportedMessage, reportedMessageID,
                 reportedMessageJumpUrl, reportedMessageChannel, reportedMessageTimestamp,
-                reportedAuthorName, reportedAuthorAvatarURL, reportedAuthorID);
+                reportedAuthorName, reportedAuthorAvatarUrl, reportedAuthorID);
         Modal reportModal = Modal.create(reportModalComponentID, "Report this to a moderator")
             .addActionRow(modalTextInput)
             .build();

application/src/main/java/org/togetherjava/tjbot/features/moderation/TransferQuestionCommand.java

@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
 import net.dv8tion.jda.api.entities.channel.forums.ForumTagSnowflake;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
@@ -29,6 +30,7 @@
 
 import java.awt.Color;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -79,7 +81,7 @@ public void onMessageContext(MessageContextInteractionEvent event) {
 
         String originalMessage = event.getTarget().getContentRaw();
         String originalMessageId = event.getTarget().getId();
-        String originalChannelId = event.getChannel().getId();
+        String originalChannelId = event.getTarget().getChannel().getId();
         String authorId = event.getTarget().getAuthor().getId();
         String mostCommonTag = tags.get(0);
 
@@ -192,19 +194,25 @@ private RestAction<Message> dmUser(MessageChannelUnion sourceChannel, ForumPost
                         Your question has been automatically transferred to %s, please continue there, thank you 👍
                         """;
 
-        String messageForDm = messageTemplate.formatted("", " on" + " " + guild.getName(),
-                forumPost.message.getJumpUrl());
+        // Prevents discord from creating a distracting auto-preview for the link
+        String jumpUrlSuffix = " ";
+
+        String messageForDm = messageTemplate.formatted("", " on " + guild.getName(),
+                forumPost.message.getJumpUrl() + jumpUrlSuffix);
 
         String messageOnDmFailure = messageTemplate.formatted(" " + forumPost.author.getAsMention(),
-                "", forumPost.message.getJumpUrl());
+                "", forumPost.message.getJumpUrl() + jumpUrlSuffix);
 
         return forumPost.author.openPrivateChannel()
             .flatMap(channel -> channel.sendMessage(messageForDm))
             .onErrorFlatMap(error -> sourceChannel.sendMessage(messageOnDmFailure));
     }
 
     private RestAction<Void> deleteOriginalMessage(JDA jda, String channelId, String messageId) {
-        return jda.getTextChannelById(channelId).deleteMessageById(messageId);
+        TextChannel sourceChannel = Objects.requireNonNull(jda.getTextChannelById(channelId),
+                "Source channel could not be found for transfer-question feature");
+
+        return sourceChannel.deleteMessageById(messageId);
     }
 
     private ForumChannel getHelperForum(JDA jda) {
@@ -223,9 +231,9 @@ private static ForumTag getTagOrDefault(List<ForumTag> tagsFoundOnForum,
     }
 
     private MessageEmbed makeEmbedForPost(User originalUser, String originalMessage) {
-        return new EmbedBuilder()
-            .setAuthor(originalUser.getName(), originalUser.getAvatarUrl(),
-                    originalUser.getAvatar().getUrl())
+        String avatarOrDefaultUrl = originalUser.getEffectiveAvatarUrl();
+
+        return new EmbedBuilder().setAuthor(originalUser.getName(), null, avatarOrDefaultUrl)
             .setDescription(originalMessage)
             .setColor(EMBED_COLOR)
             .build();

application/src/main/java/org/togetherjava/tjbot/features/moderation/audit/AuditCommand.java

@@ -136,8 +136,10 @@ private List<List<ActionRecord>> groupActionsByPages(List<ActionRecord> actions)
     }
 
     private static EmbedBuilder createSummaryEmbed(User user, Collection<ActionRecord> actions) {
+        String avatarOrDefaultUrl = user.getEffectiveAvatarUrl();
+
         return new EmbedBuilder().setTitle("Audit log of **%s**".formatted(user.getAsTag()))
-            .setAuthor(user.getName(), null, user.getAvatarUrl())
+            .setAuthor(user.getName(), null, avatarOrDefaultUrl)
             .setDescription(createSummaryMessageDescription(actions))
             .setColor(ModerationUtils.AMBIENT_COLOR);
     }

application/src/main/java/org/togetherjava/tjbot/features/moderation/audit/ModAuditLogRoutine.java

@@ -341,7 +341,9 @@ MessageEmbed toEmbed() {
                 description += "\n\nReason: " + reason;
             }
 
-            return new EmbedBuilder().setAuthor(author.getAsTag(), null, author.getAvatarUrl())
+            String avatarOrDefaultUrl = author.getEffectiveAvatarUrl();
+
+            return new EmbedBuilder().setAuthor(author.getAsTag(), null, avatarOrDefaultUrl)
                 .setDescription(description)
                 .setTimestamp(timestamp)
                 .setColor(AMBIENT_COLOR)

application/src/main/java/org/togetherjava/tjbot/features/moderation/scam/ScamBlocker.java

@@ -232,10 +232,12 @@ private void reportScamMessage(MessageReceivedEvent event, String reportTitle,
         }
 
         User author = event.getAuthor();
+        String avatarOrDefaultUrl = author.getEffectiveAvatarUrl();
+
         MessageEmbed embed =
                 new EmbedBuilder().setDescription(event.getMessage().getContentStripped())
                     .setTitle(reportTitle)
-                    .setAuthor(author.getAsTag(), null, author.getAvatarUrl())
+                    .setAuthor(author.getAsTag(), null, avatarOrDefaultUrl)
                     .setTimestamp(event.getMessage().getTimeCreated())
                     .setColor(AMBIENT_COLOR)
                     .setFooter(author.getId())