Skip to content

refactor methods to handle invalid transfers #933

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
ankitsmt211 merged 5 commits into from
Nov 1, 2023
Merged

refactor methods to handle invalid transfers #933

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1e163c
refactor methods to handle invalid transfers
ankitsmt211 Oct 24, 2023
f5cc9ce
minor change related to sent message
ankitsmt211 Oct 24, 2023
de057da
Merge branch 'develop' into bug-fix-short-message-transfer
ankitsmt211 Oct 26, 2023
4518643
refactor handling of short messages
ankitsmt211 Oct 26, 2023
9e3f922
handle longer messages
ankitsmt211 Oct 27, 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
26 changes: 8 additions & 18 deletions ...ion/src/main/java/org/togetherjava/tjbot/features/moderation/TransferQuestionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import net.dv8tion.jda.api.interactions.commands.build.Commands;
import net.dv8tion.jda.api.interactions.components.Modal;
import net.dv8tion.jda.api.interactions.components.text.TextInput;
import net.dv8tion.jda.api.interactions.components.text.TextInput.Builder;
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
import net.dv8tion.jda.api.requests.RestAction;
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
Expand Down Expand Up @@ -89,12 +90,14 @@ public void onMessageContext(MessageContextInteractionEvent event) {
.setValue(createTitle(originalMessage))
.build();

TextInput modalInput =
Builder modalInputBuilder =
TextInput.create(MODAL_INPUT_ID, "Question", TextInputStyle.PARAGRAPH)
.setValue(originalMessage)
.setRequiredRange(INPUT_MIN_LENGTH, INPUT_MAX_LENGTH)
.setPlaceholder("Contents of the question")
.build();
.setPlaceholder("Contents of the question");

if (!isQuestionTooShort(originalMessage)) {
modalInputBuilder.setValue(originalMessage);
}

TextInput modalTag = TextInput.create(MODAL_TAG, "Most fitting tag", TextInputStyle.SHORT)
.setValue(mostCommonTag)
Expand All @@ -105,7 +108,7 @@ public void onMessageContext(MessageContextInteractionEvent event) {
generateComponentId(authorId, originalMessageId, originalChannelId);
Modal transferModal = Modal.create(modalComponentId, "Transfer this question")
.addActionRow(modalTitle)
.addActionRow(modalInput)
.addActionRow(modalInputBuilder.build())
.addActionRow(modalTag)
.build();

Expand Down Expand Up @@ -242,26 +245,13 @@ private boolean isQuestionTooShort(String question) {
return question.length() < INPUT_MIN_LENGTH;
}

private void handleQuestionTooShort(MessageContextInteractionEvent event) {
event
.reply("Message content should be at least %s characters long."
.formatted(INPUT_MIN_LENGTH))
.setEphemeral(true)
.queue();
}

private boolean isInvalidForTransfer(MessageContextInteractionEvent event) {
String question = event.getTarget().getContentRaw();
User author = event.getTarget().getAuthor();

if (isBotMessageTransfer(author)) {
handleBotMessageTransfer(event);
return true;
}
if (isQuestionTooShort(question)) {
handleQuestionTooShort(event);
return true;
}
return false;
}
}