From 332ba4f0f1ad2009e731a761d697a4d7adccc0ed Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Wed, 3 May 2023 18:18:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20=D0=B2?= =?UTF-8?q?=D0=B5=D0=B1=D1=85=D1=83=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../godfather/telegram/webhook/WebhookController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/telegram-webhook/telegram-webhook-quarkus/src/main/java/dev/struchkov/godfather/telegram/webhook/WebhookController.java b/telegram-webhook/telegram-webhook-quarkus/src/main/java/dev/struchkov/godfather/telegram/webhook/WebhookController.java index d029b15..51ba2b3 100644 --- a/telegram-webhook/telegram-webhook-quarkus/src/main/java/dev/struchkov/godfather/telegram/webhook/WebhookController.java +++ b/telegram-webhook/telegram-webhook-quarkus/src/main/java/dev/struchkov/godfather/telegram/webhook/WebhookController.java @@ -23,8 +23,8 @@ import static dev.struchkov.haiti.utils.Inspector.isTrue; @Path("callback") public class WebhookController { - public static final String ERROR_ACCESS = "В доступе отказано!"; - private final String pathKey = "bot"; + private static final String ERROR_ACCESS = "В доступе отказано!"; + private static final String PATH_KEY = "bot"; private final String secretToken; private final EventDistributor eventDistributor; @@ -41,10 +41,12 @@ public class WebhookController { return Uni.createFrom().voidItem() .invoke(() -> { log.trace("Получено webhook событие: {}", update); - isTrue(pathKey.equals(botPath), accessException(ERROR_ACCESS)); + isTrue(PATH_KEY.equals(botPath), accessException(ERROR_ACCESS)); isTrue(secretToken.equals(secretTokenFromTelegram), accessException(ERROR_ACCESS)); }) .call(() -> eventDistributor.processing(update)) + .onFailure().invoke(th -> log.error("При обработке webhook события произошла ошибка. Идентификатор события: " + update.getUpdateId(), th)) + .onFailure().recoverWithNull() .invoke(() -> log.trace("Сообщили Telegram, что вебхук событие обработано. Идентификатор события: {}", update.getUpdateId())) .map(ignored -> Response.ok().build()); } @@ -55,7 +57,7 @@ public class WebhookController { public Uni testReceived(@PathParam("webhookPath") String botPath, @HeaderParam("X-Telegram-Bot-Api-Secret-Token") String secretTokenFromTelegram) { return Uni.createFrom().voidItem() .onItem().invoke(() -> { - isTrue(pathKey.equals(botPath), accessException(ERROR_ACCESS)); + isTrue(PATH_KEY.equals(botPath), accessException(ERROR_ACCESS)); isTrue(secretToken.equals(secretTokenFromTelegram), accessException(ERROR_ACCESS)); }) .onItem().transform(ignore -> "Hi there " + botPath + "!");