From 901a1cdc05c05bfcf13b08348c11cc9ce05fe1d2 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Fri, 27 Jan 2023 10:59:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D1=81=D1=8B=D0=BB=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=B2=D0=BE=20=D0=B2=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../telegram/main/consumer/MessageMailConvert.java | 7 ++++++- .../godfather/telegram/simple/core/util/TriggerChecks.java | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java b/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java index cbc1f23..4d53190 100644 --- a/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java +++ b/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/MessageMailConvert.java @@ -129,7 +129,12 @@ public final class MessageMailConvert { private static Optional convertEntity(Message message, MessageEntity entity) { switch (entity.getType()) { case "text_link" -> { - return Optional.of(new LinkAttachment(entity.getUrl())); + return Optional.of(entity.getUrl()) + .map(LinkAttachment::new); + } + case "url" -> { + return Optional.of(entity.getText()) + .map(LinkAttachment::new); } case "bot_command" -> { final String commandValue = entity.getText(); diff --git a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java index 4a82eca..b02ce58 100644 --- a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java +++ b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/util/TriggerChecks.java @@ -31,4 +31,8 @@ public class TriggerChecks { return mail -> Attachments.findFirstButtonClick(mail.getAttachments()).isPresent(); } + public static Predicate isLinks() { + return mail -> Attachments.findFirstLink(mail.getAttachments()).isPresent(); + } + }