BugFix: Bot mentions itself in Help-Thread at Timeout (#975)

Co-authored-by: Zabuzard <zabuza.dev@gmail.com>

Author: firasrg

application/src/main/java/org/togetherjava/tjbot/features/help/HelpSystemHelper.java

@@ -355,4 +355,14 @@ public String getTagName() {
             return tagName;
         }
     }
+
+    Optional<Long> getAuthorByHelpThreadId(final long channelId) {
+
+        logger.debug("Looking for thread-record using channel ID: {}", channelId);
+
+        return database.read(context -> context.select(HelpThreads.HELP_THREADS.AUTHOR_ID)
+            .from(HelpThreads.HELP_THREADS)
+            .where(HelpThreads.HELP_THREADS.CHANNEL_ID.eq(channelId))
+            .fetchOptional(HelpThreads.HELP_THREADS.AUTHOR_ID));
+    }
 }

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java

@@ -10,7 +10,6 @@
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.requests.RestAction;
-import net.dv8tion.jda.api.utils.Result;
 import net.dv8tion.jda.api.utils.TimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -127,24 +126,27 @@ private static boolean shouldBeArchived(MessageChannel channel, Instant archiveA
 
     private void handleArchiveFlow(ThreadChannel threadChannel, MessageEmbed embed) {
 
-        Function<Result<Member>, RestAction<Message>> sendEmbedWithMention =
-                member -> threadChannel.sendMessage(member.get().getAsMention()).addEmbeds(embed);
+        Function<Member, RestAction<Message>> sendEmbedWithMention =
+                member -> threadChannel.sendMessage(member.getAsMention()).addEmbeds(embed);
 
         Supplier<RestAction<Message>> sendEmbedWithoutMention =
                 () -> threadChannel.sendMessageEmbeds(embed);
 
+        long authorId = helper.getAuthorByHelpThreadId(threadChannel.getIdLong()).orElseThrow();
+
         threadChannel.getGuild()
-            .retrieveMemberById(threadChannel.getOwnerIdLong())
+            .retrieveMemberById(authorId)
             .mapToResult()
-            .flatMap(foundMember -> {
-                if (foundMember.isSuccess()) {
-                    return sendEmbedWithMention.apply(foundMember);
+            .flatMap(authorResults -> {
+                if (authorResults.isFailure()) {
+                    logger.info(
+                            "Trying to archive a thread ({}), but OP ({}) left the server, sending embed without mention",
+                            threadChannel.getId(), authorId, authorResults.getFailure());
+
+                    return sendEmbedWithoutMention.get();
                 }
-                logger.info(
-                        "Owner of thread with id: {} left the server, sending embed without mention",
-                        threadChannel.getId(), foundMember.getFailure());
 
-                return sendEmbedWithoutMention.get();
+                return sendEmbedWithMention.apply(authorResults.get());
             })
             .flatMap(any -> threadChannel.getManager().setArchived(true))
             .queue();

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadCreatedListener.java

@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
 import net.dv8tion.jda.api.events.channel.ChannelCreateEvent;
@@ -38,6 +39,7 @@ public final class HelpThreadCreatedListener extends ListenerAdapter
         implements EventReceiver, UserInteractor {
 
     private final HelpSystemHelper helper;
+
     private final Cache<Long, Instant> threadIdToCreatedAtCache = Caffeine.newBuilder()
         .maximumSize(1_000)
         .expireAfterAccess(2, TimeUnit.of(ChronoUnit.MINUTES))
@@ -81,7 +83,17 @@ private boolean wasThreadAlreadyHandled(long threadChannelId) {
     }
 
     private void handleHelpThreadCreated(ThreadChannel threadChannel) {
-        helper.writeHelpThreadToDatabase(threadChannel.getOwnerIdLong(), threadChannel);
+        threadChannel.retrieveMessageById(threadChannel.getIdLong()).queue(message -> {
+
+            long authorId = threadChannel.getOwnerIdLong();
+
+            if (isPostedBySelfUser(message)) {
+                // When transfer-command is used
+                authorId = getMentionedAuthorByMessage(message).getIdLong();
+            }
+
+            helper.writeHelpThreadToDatabase(authorId, threadChannel);
+        });
 
         // The creation is delayed, because otherwise it could be too fast and be executed
         // after Discord created the thread, but before Discord send OPs initial message.
@@ -90,6 +102,14 @@ private void handleHelpThreadCreated(ThreadChannel threadChannel) {
             .queueAfter(5, TimeUnit.SECONDS);
     }
 
+    private static User getMentionedAuthorByMessage(Message message) {
+        return message.getMentions().getUsers().getFirst();
+    }
+
+    private static boolean isPostedBySelfUser(Message message) {
+        return message.getJDA().getSelfUser().equals(message.getAuthor());
+    }
+
     private RestAction<Message> createAIResponse(ThreadChannel threadChannel) {
         RestAction<Message> originalQuestion =
                 threadChannel.retrieveMessageById(threadChannel.getIdLong());