From 35167a00d215b96fad57d7bf96aeeb9acdcd57ea Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Tue, 19 Jul 2022 20:53:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D1=80=D0=B0=D0=B1=D0=B0=D1=82=D1=8B=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=87=D0=B0=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 telegram-core/pom.xml                         |  2 +-
 .../listen/EventDistributorService.java       | 19 +++++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 781b8ca..a59d692 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>dev.struchkov.godfather</groupId>
     <artifactId>telegram-bot</artifactId>
-    <version>0.0.17</version>
+    <version>0.0.18</version>
     <packaging>pom</packaging>
 
     <modules>
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 @@
     <parent>
         <groupId>dev.struchkov.godfather</groupId>
         <artifactId>telegram-bot</artifactId>
-        <version>0.0.17</version>
+        <version>0.0.18</version>
     </parent>
 
     <artifactId>telegram-core</artifactId>
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<List<EventProvider>> getEventProvider(String type) {
         return Optional.ofNullable(eventProviderMap.get(type));
     }