Skip to content

refactor HelpThreadCreatedListener #1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 13, 2024
Merged

refactor HelpThreadCreatedListener #1078

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f60a518
refactor HelpThreadCreatedListener
ankitsmt211 Mar 26, 2024
a43938a
requested changes
ankitsmt211 Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 30 additions & 32 deletions ...ication/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadCreatedListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
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.Channel;
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;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.requests.RestAction;
import org.jetbrains.annotations.NotNull;

import org.togetherjava.tjbot.features.EventReceiver;
import org.togetherjava.tjbot.features.UserInteractionType;
Expand Down Expand Up @@ -56,20 +58,18 @@ public HelpThreadCreatedListener(HelpSystemHelper helper) {
}

@Override
public void onChannelCreate(ChannelCreateEvent createEvent) {
if (!createEvent.getChannelType().isThread()) {
return;
}
ThreadChannel threadChannel = createEvent.getChannel().asThreadChannel();

if (wasThreadAlreadyHandled(threadChannel.getIdLong())) {
return;
}

if (!helper.isHelpForumName(threadChannel.getParentChannel().getName())) {
return;
public void onMessageReceived(@NotNull MessageReceivedEvent event) {
if (event.isFromThread()) {
Channel parentChannel = event.getChannel().asThreadChannel().getParentChannel();
if (helper.isHelpForumName(parentChannel.getName())) {
ThreadChannel threadChannel = event.getChannel().asThreadChannel();
int messageCount = threadChannel.getMessageCount();
if (messageCount > 1 || wasThreadAlreadyHandled(threadChannel.getIdLong())) {
return;
}
handleHelpThreadCreated(threadChannel);
}
}
handleHelpThreadCreated(threadChannel);
}

private boolean wasThreadAlreadyHandled(long threadChannelId) {
Expand All @@ -82,23 +82,10 @@ private boolean wasThreadAlreadyHandled(long threadChannelId) {
}

private void handleHelpThreadCreated(ThreadChannel 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.
// Sending messages at that moment is not allowed.
createMessages(threadChannel).and(pinOriginalQuestion(threadChannel))
.queueAfter(5, TimeUnit.SECONDS);
threadChannel.retrieveStartMessage().flatMap(message -> {
registerThreadDataInDB(message, threadChannel);
return generateAutomatedResponse(threadChannel);
}).flatMap(message -> pinOriginalQuestion(threadChannel)).queue();
}

private static User getMentionedAuthorByMessage(Message message) {
Expand Down Expand Up @@ -126,7 +113,7 @@ private RestAction<Void> pinOriginalQuestion(ThreadChannel threadChannel) {
return threadChannel.retrieveMessageById(threadChannel.getIdLong()).flatMap(Message::pin);
}

private RestAction<Message> createMessages(ThreadChannel threadChannel) {
private RestAction<Message> generateAutomatedResponse(ThreadChannel threadChannel) {
return sendHelperHeadsUp(threadChannel).flatMap(any -> createAIResponse(threadChannel));
}

Expand Down Expand Up @@ -228,4 +215,15 @@ private void handleDismiss(Member interactionUser, ThreadChannel channel,
}
deleteMessages.queue();
}

private void registerThreadDataInDB(Message message, ThreadChannel threadChannel) {
long authorId = threadChannel.getOwnerIdLong();

if (isPostedBySelfUser(message)) {
// When transfer-command is used
authorId = getMentionedAuthorByMessage(message).getIdLong();
}

helper.writeHelpThreadToDatabase(authorId, threadChannel);
}
}