From 071a7199ad247a01fd56c8e5c1ca755288d6701b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Thu, 6 Jun 2024 14:26:31 +0200 Subject: [PATCH] using icons in buttons --- src/main/java/de/ph87/kleinanzeigen/api/Bot.java | 11 ++++++++--- .../java/de/ph87/kleinanzeigen/api/Kleinanzeigen.java | 5 +---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/ph87/kleinanzeigen/api/Bot.java b/src/main/java/de/ph87/kleinanzeigen/api/Bot.java index fd319ea..1d104af 100644 --- a/src/main/java/de/ph87/kleinanzeigen/api/Bot.java +++ b/src/main/java/de/ph87/kleinanzeigen/api/Bot.java @@ -15,6 +15,7 @@ import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKe import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; +import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -27,6 +28,10 @@ import static de.ph87.kleinanzeigen.api.JSON.objectMapper; @Slf4j public class Bot extends TelegramLongPollingBot { + private static final String ICON_CHECK = "✅"; + + private static final String ICON_REMOVE = "❌"; + private static final long CHAT_ID = 101138682L; private final DefaultBotSession session; @@ -156,10 +161,10 @@ public class Bot extends TelegramLongPollingBot { final ArrayList> keyboard = new ArrayList<>(); final ArrayList row = new ArrayList<>(); if (offer.isRemember()) { - addButton(row, "Nicht mehr merken", InlineCommand.UNREMEMBER, offer); + addButton(row, ICON_CHECK + ICON_CHECK + ICON_CHECK + " Gemerkt " + ICON_CHECK + ICON_CHECK + ICON_CHECK, InlineCommand.UNREMEMBER, offer); } else { - addButton(row, "Ignorieren", InlineCommand.IGNORE, offer); - addButton(row, "Merken", InlineCommand.REMEMBER, offer); + addButton(row, ICON_REMOVE + " Ignorieren", InlineCommand.IGNORE, offer); + addButton(row, ICON_CHECK + " Merken", InlineCommand.REMEMBER, offer); } keyboard.add(row); markup.setKeyboard(keyboard); diff --git a/src/main/java/de/ph87/kleinanzeigen/api/Kleinanzeigen.java b/src/main/java/de/ph87/kleinanzeigen/api/Kleinanzeigen.java index 7cf3aa9..4dbb028 100644 --- a/src/main/java/de/ph87/kleinanzeigen/api/Kleinanzeigen.java +++ b/src/main/java/de/ph87/kleinanzeigen/api/Kleinanzeigen.java @@ -130,10 +130,7 @@ public class Kleinanzeigen { synchronized (offer) { offers.stream() .filter(existing -> existing.getId().equals(offer.getId())) - .peek(existing -> { - existing.merge(offer); - log.info("Updated: {}", existing); - }) + .peek(existing -> existing.merge(offer)) .findFirst() .orElseGet(() -> { log.info("Created: {}", offer);