Skip to content

Commit 08f4dbf

Browse files
committed
Move context logic into custom method
1 parent 15038ea commit 08f4dbf

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.github.benmanes.caffeine.cache.Caffeine;
55
import net.dv8tion.jda.api.entities.Member;
66
import net.dv8tion.jda.api.entities.Message;
7-
import net.dv8tion.jda.api.entities.User;
87
import net.dv8tion.jda.api.entities.MessageEmbed;
98
import net.dv8tion.jda.api.entities.Role;
9+
import net.dv8tion.jda.api.entities.User;
1010
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
1111
import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
1212
import net.dv8tion.jda.api.events.channel.ChannelCreateEvent;
@@ -115,13 +115,16 @@ private static boolean isPostedBySelfUser(Message message) {
115115
private RestAction<Message> createAIResponse(ThreadChannel threadChannel) {
116116
RestAction<Message> originalQuestion =
117117
threadChannel.retrieveMessageById(threadChannel.getIdLong());
118-
return originalQuestion.flatMap(
119-
message -> !MessageUtils.containsImage(message)
120-
&& !LinkDetections.containsLink(message.getContentRaw()),
118+
return originalQuestion.flatMap(HelpThreadCreatedListener::isContextSufficient,
121119
message -> helper.constructChatGptAttempt(threadChannel, getMessageContent(message),
122120
componentIdInteractor));
123121
}
124122

123+
private static boolean isContextSufficient(Message message) {
124+
return !MessageUtils.containsImage(message)
125+
&& !LinkDetections.containsLink(message.getContentRaw());
126+
}
127+
125128
private RestAction<Void> pinOriginalQuestion(ThreadChannel threadChannel) {
126129
return threadChannel.retrieveMessageById(threadChannel.getIdLong()).flatMap(Message::pin);
127130
}

0 commit comments

Comments
 (0)