справлен RegexFilter.java

Author: AlexanderBazarov

src/main/java/ru/untitled_devs/core/routers/filters/RegexFilter.java

@@ -14,14 +14,33 @@ public RegexFilter(String pattern) {
 
     @Override
     public boolean check(Update update) {
-        String text = update.hasMessage() ? update.getMessage().getText()
-                : update.hasCallbackQuery() ? update.getCallbackQuery().getData()
-                : null;
+        String text = extractTextFromUpdate(update);
 
         if (text == null) return false;
 
         return this.pattern.matcher(text).find();
     }
 
+    private String extractTextFromUpdate(Update update) {
+        if (update.hasMessage() && update.getMessage().hasText()) {
+            return update.getMessage().getText();
+        }
+        if (update.hasEditedMessage() && update.getEditedMessage().hasText()) {
+            return update.getEditedMessage().getText();
+        }
+        if (update.hasChannelPost() && update.getChannelPost().hasText()) {
+            return update.getChannelPost().getText();
+        }
+        if (update.hasEditedChannelPost() && update.getEditedChannelPost().hasText()) {
+            return update.getEditedChannelPost().getText();
+        }
+        if (update.hasCallbackQuery()) {
+            return update.getCallbackQuery().getData();
+        }
+        if (update.hasInlineQuery()) {
+            return update.getInlineQuery().getQuery();
+        }
+        return null;
+    }
 
 }

src/test/java/ru/untitleddevs/core/routers/filters/RegexFilterTest.java

@@ -29,6 +29,8 @@ void setUp() {
     @Test
     void checkShouldReturnTrueWhenPatternMatchesText() {
         RegexFilter filter = new RegexFilter("hello");
+        when(updateMock.hasMessage()).thenReturn(true);
+        when(messageMock.hasText()).thenReturn(true);
         when(messageMock.getText()).thenReturn("say hello to the world");
 
         boolean result = filter.check(updateMock);
@@ -48,7 +50,9 @@ void checkShouldReturnFalseWhenPatternDoesNotMatchText() {
 
     @Test
     void checkShouldHonorUnicodeFlagWhenMatchingUnicodeCharacters() {
-        RegexFilter filter = new RegexFilter("привет");
+        RegexFilter filter = new RegexFilter("\\p{L}+");
+        when(updateMock.hasMessage()).thenReturn(true);
+        when(messageMock.hasText()).thenReturn(true);
         when(messageMock.getText()).thenReturn("Скажи привет, пожалуйста");
 
         boolean result = filter.check(updateMock);