resolve conflicts

Author: ankitsmt211

application/build.gradle

@@ -74,7 +74,7 @@ dependencies {
 
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
 
-    implementation 'org.kohsuke:github-api:1.317'
+    implementation 'org.kohsuke:github-api:1.318'
 
     testImplementation 'org.mockito:mockito-core:5.3.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'

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

@@ -373,4 +373,13 @@ enum TicketStatus {
             this.val = val;
         }
     }
+    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

@@ -3,11 +3,13 @@
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import net.dv8tion.jda.api.exceptions.ErrorResponseException;
+import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.TimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +21,8 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * Routine, which periodically checks all help threads and archives them if there has not been any
@@ -122,18 +125,30 @@ private static boolean shouldBeArchived(MessageChannel channel, Instant archiveA
     }
 
     private void handleArchiveFlow(ThreadChannel threadChannel, MessageEmbed embed) {
-        Consumer<Throwable> handleFailure = error -> {
-            if (error instanceof ErrorResponseException) {
-                logger.warn("Unknown error occurred during help thread auto archive routine",
-                        error);
-            }
-        };
+
+        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())
-            .flatMap(author -> threadChannel.sendMessage(author.getAsMention()).addEmbeds(embed))
+            .retrieveMemberById(authorId)
+            .mapToResult()
+            .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();
+                }
+
+                return sendEmbedWithMention.apply(authorResults.get());
+            })
             .flatMap(any -> threadChannel.getManager().setArchived(true))
-            .queue(any -> {
-            }, handleFailure);
+            .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());

build.gradle

@@ -9,7 +9,7 @@ group 'org.togetherjava'
 version '1.0-SNAPSHOT'
 
 ext {
-    jooqVersion = '3.18.0'
+    jooqVersion = '3.19.1'
     jacksonVersion = '2.16.0'
     chatGPTVersion = '0.18.0'
 }

buildSrc/build.gradle

@@ -7,6 +7,6 @@ repositories {
 }
 
 dependencies {
-    implementation "gradle.plugin.org.flywaydb:gradle-plugin-publishing:10.3.0"
-    implementation 'nu.studer:gradle-jooq-plugin:8.2'
+    implementation "gradle.plugin.org.flywaydb:gradle-plugin-publishing:10.4.0"
+    implementation 'nu.studer:gradle-jooq-plugin:9.0'
 }

database/build.gradle

@@ -7,7 +7,7 @@ var sqliteVersion = "3.44.0.0"
 dependencies {
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation "org.xerial:sqlite-jdbc:${sqliteVersion}"
-    implementation 'org.flywaydb:flyway-core:10.3.0'
+    implementation 'org.flywaydb:flyway-core:10.4.0'
     implementation "org.jooq:jooq:$jooqVersion"
 
     implementation project(':utils')