From 697c0c038dbe2eccd5e501cf323503f2e089bbb9 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Sun, 14 May 2023 01:51:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BB=20UnitTrigger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../telegram/main}/core/util/UnitTrigger.java | 16 ++++-
 .../quarkus/core/util/UnitTrigger.java        | 68 -------------------
 3 files changed, 15 insertions(+), 71 deletions(-)
 rename telegram-core/{telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple => telegram-core-main/src/main/java/dev/struchkov/godfather/telegram/main}/core/util/UnitTrigger.java (72%)
 delete mode 100644 telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/util/UnitTrigger.java

diff --git a/pom.xml b/pom.xml
index 39e6015..4705896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <godfather.core.ver>0.0.65</godfather.core.ver>
+        <godfather.core.ver>0.0.66-SNAPSHOT</godfather.core.ver>
 
         <!-- https://mvnrepository.com/artifact/org.telegram/telegrambots -->
         <telegrambots.ver>6.5.0</telegrambots.ver>
diff --git a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/UnitTrigger.java b/telegram-core/telegram-core-main/src/main/java/dev/struchkov/godfather/telegram/main/core/util/UnitTrigger.java
similarity index 72%
rename from telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/UnitTrigger.java
rename to telegram-core/telegram-core-main/src/main/java/dev/struchkov/godfather/telegram/main/core/util/UnitTrigger.java
index 6c3e3ab..58034de 100644
--- a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/UnitTrigger.java
+++ b/telegram-core/telegram-core-main/src/main/java/dev/struchkov/godfather/telegram/main/core/util/UnitTrigger.java
@@ -1,8 +1,8 @@
-package dev.struchkov.godfather.telegram.simple.core.util;
+package dev.struchkov.godfather.telegram.main.core.util;
 
 import dev.struchkov.godfather.main.domain.content.Mail;
 import dev.struchkov.godfather.telegram.domain.attachment.ButtonClickAttachment;
-import dev.struchkov.godfather.telegram.main.core.util.Attachments;
+import dev.struchkov.godfather.telegram.domain.attachment.CommandAttachment;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -28,6 +28,18 @@ public class UnitTrigger {
         };
     }
 
+    public static Predicate<Mail> isCommandByType(String commandType) {
+        return mail -> {
+            final Optional<CommandAttachment> optCommand = Attachments.findFirstCommand(mail.getAttachments());
+            if (optCommand.isPresent()) {
+                final CommandAttachment command = optCommand.get();
+                final String type = command.getCommandType();
+                return type.equals(commandType);
+            }
+            return false;
+        };
+    }
+
     public static Predicate<Mail> isButtonClick() {
         return mail -> Attachments.findFirstButtonClick(mail.getAttachments()).isPresent();
     }
diff --git a/telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/util/UnitTrigger.java b/telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/util/UnitTrigger.java
deleted file mode 100644
index bd21e4f..0000000
--- a/telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/util/UnitTrigger.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package dev.struchkov.godfather.telegram.quarkus.core.util;
-
-import dev.struchkov.godfather.main.domain.content.Mail;
-import dev.struchkov.godfather.quarkus.domain.unit.func.UniPredicate;
-import dev.struchkov.godfather.telegram.domain.attachment.ButtonClickAttachment;
-import dev.struchkov.godfather.telegram.domain.attachment.CommandAttachment;
-import dev.struchkov.godfather.telegram.main.core.util.Attachments;
-
-import java.util.Optional;
-
-import static dev.struchkov.godfather.quarkus.domain.unit.func.UniPredicate.predicate;
-import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
-
-public class UnitTrigger {
-
-    private UnitTrigger() {
-        utilityClass();
-    }
-
-    public static UniPredicate<Mail> clickButtonRaw(String rawCallBackData) {
-        return predicate(
-                mail -> {
-                    final Optional<ButtonClickAttachment> optButtonClick = Attachments.findFirstButtonClick(mail.getAttachments());
-                    if (optButtonClick.isPresent()) {
-                        final ButtonClickAttachment buttonClick = optButtonClick.get();
-                        final String rawData = buttonClick.getRawCallBackData();
-                        return rawData.equals(rawCallBackData);
-                    }
-                    return false;
-                }
-        );
-    }
-
-    public static UniPredicate<Mail> isCommandByType(String commandType) {
-        return predicate(
-                mail -> {
-                    final Optional<CommandAttachment> optCommand = Attachments.findFirstCommand(mail.getAttachments());
-                    if (optCommand.isPresent()) {
-                        final CommandAttachment command = optCommand.get();
-                        final String type = command.getCommandType();
-                        return type.equals(commandType);
-                    }
-                    return false;
-                }
-        );
-    }
-
-    public static UniPredicate<Mail> isCommand() {
-        return predicate(mail -> Attachments.findFirstCommand(mail.getAttachments()).isPresent());
-    }
-
-    public static UniPredicate<Mail> isButtonClick() {
-        return predicate(mail -> Attachments.findFirstButtonClick(mail.getAttachments()).isPresent());
-    }
-
-    public static UniPredicate<Mail> isButtonClickArg(String argType) {
-        return predicate(
-                mail -> Attachments.findFirstButtonClick(mail.getAttachments())
-                        .flatMap(click -> click.getArgByType(argType))
-                        .isPresent()
-        );
-    }
-
-    public static UniPredicate<Mail> isLinks() {
-        return predicate(mail -> Attachments.findFirstLink(mail.getAttachments()).isPresent());
-    }
-
-}