diff --git a/pom.xml b/pom.xml index 781b8ca..a59d692 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather telegram-bot - 0.0.17 + 0.0.18 pom diff --git a/telegram-core/pom.xml b/telegram-core/pom.xml index 8a725ec..af92a34 100644 --- a/telegram-core/pom.xml +++ b/telegram-core/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather telegram-bot - 0.0.17 + 0.0.18 telegram-core diff --git a/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributorService.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributorService.java index 81e2d95..0e8f25c 100644 --- a/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributorService.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributorService.java @@ -38,8 +38,10 @@ public class EventDistributorService implements EventDistributor { public void processing(@NotNull Update update) { if (update.getMessage() != null) { final Message message = update.getMessage(); - getEventProvider(Mail.TYPE) - .ifPresent(eventProviders -> eventProviders.forEach(eventProvider -> eventProvider.sendEvent(MessageMailConvert.apply(message)))); + if (!isEvent(message)) { + getEventProvider(Mail.TYPE) + .ifPresent(eventProviders -> eventProviders.forEach(eventProvider -> eventProvider.sendEvent(MessageMailConvert.apply(message)))); + } } if (update.getCallbackQuery() != null) { final CallbackQuery callbackQuery = update.getCallbackQuery(); @@ -59,6 +61,19 @@ public class EventDistributorService implements EventDistributor { } } + private boolean isEvent(Message message) { + return message.getChannelChatCreated() != null + || message.getDeleteChatPhoto() != null + || message.getNewChatMembers() != null + || message.getNewChatTitle() != null + || message.getNewChatPhoto() != null + || message.getVideoChatEnded() != null + || message.getVideoChatParticipantsInvited() != null + || message.getVideoChatScheduled() != null + || message.getVideoNote() != null + || message.getVideoChatStarted() != null; + } + private Optional> getEventProvider(String type) { return Optional.ofNullable(eventProviderMap.get(type)); }