Skip to content

fix inability to read embeds in helper threads #915

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
Zabuzard merged 5 commits into from
Oct 23, 2023
Merged

fix inability to read embeds in helper threads #915

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbcd6fb
fix inability to read embeds in helper threads
ankitsmt211 Oct 20, 2023
33db2e8
refactor method name
ankitsmt211 Oct 22, 2023
1e42080
add content from multiple embeds
ankitsmt211 Oct 22, 2023
9bd78d5
refactor method
ankitsmt211 Oct 23, 2023
06dc663
resolved conflicts
ankitsmt211 Oct 23, 2023
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
17 changes: 15 additions & 2 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 @@ -3,6 +3,7 @@
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
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.channel.concrete.ThreadChannel;
import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
Expand All @@ -15,6 +16,7 @@
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
* Listens for new help threads being created. That is, a user posted a question in the help forum.
Expand Down Expand Up @@ -78,8 +80,8 @@ private void handleHelpThreadCreated(ThreadChannel threadChannel) {
private RestAction<Message> createAIResponse(ThreadChannel threadChannel) {
RestAction<Message> originalQuestion =
threadChannel.retrieveMessageById(threadChannel.getIdLong());
return originalQuestion.flatMap(
message -> helper.constructChatGptAttempt(threadChannel, message.getContentRaw()));
return originalQuestion.flatMap(message -> helper.constructChatGptAttempt(threadChannel,
getMessageContent(message)));
}

private RestAction<Void> pinOriginalQuestion(ThreadChannel threadChannel) {
Expand Down Expand Up @@ -112,4 +114,15 @@ private RestAction<Message> sendHelperHeadsUp(ThreadChannel threadChannel) {
return threadChannel.sendMessage(headsUpWithoutRole)
.flatMap(message -> message.editMessage(headsUpWithRole));
}

private String getMessageContent(Message message) {
if (message.getEmbeds().isEmpty()) {
return message.getContentRaw();
}

return message.getEmbeds()
.stream()
.map(MessageEmbed::getDescription)
.collect(Collectors.joining("\n"));
}
}