Skip to content

SlashCommandEducator should check length #783

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
Taz03 merged 6 commits into from
Feb 25, 2023
Merged

SlashCommandEducator should check length #783

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff2f5b1
[Abhishek]Add verify the content length
abhishekanuj26 Feb 22, 2023
d4c5bdf
[Abhishek] Made the max content length as constant
abhishekanuj26 Feb 23, 2023
f5b818f
[Abhishek] Added. Test when message's length is greater than thirty.
abhishekanuj26 Feb 23, 2023
6136542
[Abhishek] Refactored. content to command
abhishekanuj26 Feb 23, 2023
ac2a64c
[Abhishek] Refactored. test cases
abhishekanuj26 Feb 23, 2023
6c1606e
[Abhishek] Removed. Unnecessary test case
abhishekanuj26 Feb 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
4 changes: 3 additions & 1 deletion application/src/main/java/org/togetherjava/tjbot/features/basic/SlashCommandEducator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* then educates the user about using slash commands, such as {@code /foo} instead.
*/
public final class SlashCommandEducator extends MessageReceiverAdapter {
private static final int MAX_COMMAND_LENGTH = 30;
private static final String SLASH_COMMAND_POPUP_ADVICE_PATH = "slashCommandPopupAdvice.png";
private static final Predicate<String> IS_MESSAGE_COMMAND = Pattern.compile("""
[.!?] #Start of message command
Expand All @@ -33,7 +34,8 @@ public void onMessageReceived(MessageReceivedEvent event) {
}

String content = event.getMessage().getContentRaw();
if (IS_MESSAGE_COMMAND.test(content)) {

if (IS_MESSAGE_COMMAND.test(content) && content.length() < MAX_COMMAND_LENGTH) {
sendAdvice(event.getMessage());
}
}
Expand Down
16 changes: 15 additions & 1 deletion ...ication/src/test/java/org/togetherjava/tjbot/features/basic/SlashCommandEducatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,25 @@ void ignoresOtherMessages(String message) {
verify(event.getMessage(), never()).replyEmbeds(any(MessageEmbed.class));
}

@ParameterizedTest
@MethodSource("provideOtherMessages")
void ignoresMessagesWhereLengthIsGreaterThanThirty(String message) {
// GIVEN a message's length is more than Thirty
// WHEN the message is sent
MessageReceivedEvent event = sendMessage(message);

// THEN the system ignores the message and does not reply to it
verify(event.getMessage(), never()).replyEmbeds(any(MessageEmbed.class));
}

private static Stream<String> provideMessageCommands() {
return Stream.of("!foo", ".foo", "?foo", ".test", "!whatever", "!this is a test");
}

private static Stream<String> provideOtherMessages() {
return Stream.of(" a ", "foo", "#foo", "/foo", "!!!", "?!?!?", "?", ".,-", "!f", "! foo");
return Stream.of(" a ", "foo", "#foo", "/foo", "!!!", "?!?!?", "?", ".,-", "!f", "! foo",
"thisIsAWordWhichLengthIsMoreThanThirtyLetterSoItShouldNotReply",
".isLetter and .isNumber are available");

}
}