|
53 | 53 | import org.telegram.telegrambots.meta.api.methods.send.SendMessage; |
54 | 54 | import org.telegram.telegrambots.meta.api.methods.send.SendPhoto; |
55 | 55 | import org.telegram.telegrambots.meta.api.methods.send.SendVoice; |
56 | | -import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageText; |
57 | 56 | import org.telegram.telegrambots.meta.api.objects.Document; |
58 | 57 | import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; |
59 | 58 | import org.telegram.telegrambots.meta.api.objects.InputFile; |
@@ -149,7 +148,6 @@ public class TelegramAdapter implements ChannelPort, LongPollingSingleThreadUpda |
149 | 148 | private volatile String registeredBotToken; |
150 | 149 | private final Object lifecycleLock = new Object(); |
151 | 150 | private final Map<String, InviteAttemptState> inviteAttemptStates = new ConcurrentHashMap<>(); |
152 | | - private final Map<String, ProgressStatusMessage> progressMessages = new ConcurrentHashMap<>(); |
153 | 151 |
|
154 | 152 | /** |
155 | 153 | * Package-private setter for testing — allows injecting a mock TelegramClient. |
@@ -776,24 +774,11 @@ public CompletableFuture<Void> sendProgressUpdate(String chatId, ProgressUpdate |
776 | 774 | return; |
777 | 775 | } |
778 | 776 | if (update.type() == ProgressUpdateType.CLEAR) { |
779 | | - progressMessages.remove(chatId); |
780 | 777 | return; |
781 | 778 | } |
782 | 779 |
|
783 | 780 | String rendered = renderProgressUpdate(update); |
784 | | - ProgressStatusMessage current = progressMessages.get(chatId); |
785 | | - if (current != null && rendered.equals(current.text())) { |
786 | | - return; |
787 | | - } |
788 | | - if (current != null && tryEditProgressMessage(chatId, current.messageId(), rendered)) { |
789 | | - progressMessages.put(chatId, new ProgressStatusMessage(current.messageId(), rendered)); |
790 | | - return; |
791 | | - } |
792 | | - |
793 | | - Integer messageId = sendProgressMessage(chatId, rendered); |
794 | | - if (messageId != null) { |
795 | | - progressMessages.put(chatId, new ProgressStatusMessage(messageId, rendered)); |
796 | | - } |
| 781 | + sendProgressMessage(chatId, rendered); |
797 | 782 | }); |
798 | 783 | } |
799 | 784 |
|
@@ -860,24 +845,8 @@ private Integer sendProgressMessage(String chatId, String rendered) { |
860 | 845 | } |
861 | 846 | } |
862 | 847 |
|
863 | | - private boolean tryEditProgressMessage(String chatId, int messageId, String rendered) { |
864 | | - try { |
865 | | - EditMessageText edit = EditMessageText.builder() |
866 | | - .chatId(chatId) |
867 | | - .messageId(messageId) |
868 | | - .text(TelegramHtmlFormatter.format(rendered)) |
869 | | - .parseMode("HTML") |
870 | | - .build(); |
871 | | - executeWithRetry(() -> telegramClient.execute(edit)); |
872 | | - return true; |
873 | | - } catch (Exception e) { |
874 | | - log.debug("Failed to edit progress update in chat {}: {}", chatId, e.getMessage()); |
875 | | - return false; |
876 | | - } |
877 | | - } |
878 | | - |
879 | 848 | private String renderProgressUpdate(ProgressUpdate update) { |
880 | | - String prefix = update.type() == ProgressUpdateType.INTENT ? "Working on this:\n" : "Progress update:\n"; |
| 849 | + String prefix = update.type() == ProgressUpdateType.INTENT ? "" : "Progress update:\n"; |
881 | 850 | return prefix + update.text(); |
882 | 851 | } |
883 | 852 |
|
@@ -931,9 +900,6 @@ private String truncateCaption(String caption) { |
931 | 900 | return caption.substring(0, TELEGRAM_MAX_CAPTION_LENGTH - 3) + "..."; |
932 | 901 | } |
933 | 902 |
|
934 | | - private record ProgressStatusMessage(int messageId, String text) { |
935 | | - } |
936 | | - |
937 | 903 | private static String truncateForLog(String text, int maxLen) { |
938 | 904 | if (text == null || text.length() <= maxLen) |
939 | 905 | return text; |
|
0 commit comments