From 99d72f46fdf7acc3410b7b64bfbed6a2dcbe42c5 Mon Sep 17 00:00:00 2001 From: Denis Elkin Date: Fri, 23 Jan 2026 17:39:01 +0300 Subject: [PATCH 1/2] Add format and parseMode params for EditTextRequest --- .../im/botapi/BotApiClientController.java | 4 +++- .../java/ru/mail/im/botapi/api/Messages.java | 2 ++ .../im/botapi/api/entity/EditTextRequest.java | 20 +++++++++++++++++++ .../im/botapi/sample/AppCommandHandler.java | 2 +- .../ru/mail/im/botapi/sample/SimpleStart.java | 4 +++- 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/ru/mail/im/botapi/BotApiClientController.java b/library/src/main/java/ru/mail/im/botapi/BotApiClientController.java index 4e739ef..ff2e1c7 100644 --- a/library/src/main/java/ru/mail/im/botapi/BotApiClientController.java +++ b/library/src/main/java/ru/mail/im/botapi/BotApiClientController.java @@ -145,6 +145,8 @@ public ApiResponse editText(final EditTextRequest request) throws IOException { request.getChatId(), request.getMsgId(), request.getNewText(), + request.getFormat(), + request.getParseMode(), request.getKeyboard() ); } @@ -158,7 +160,7 @@ public ApiResponse editText( final long msgId, final String text ) throws IOException { - return client.messages().editText(chatId, msgId, text, null); + return client.messages().editText(chatId, msgId, text, null, null, null); } public ApiResponse deleteMessage(final DeleteMessagesRequest request) throws IOException { diff --git a/library/src/main/java/ru/mail/im/botapi/api/Messages.java b/library/src/main/java/ru/mail/im/botapi/api/Messages.java index a0f2469..a31ee76 100644 --- a/library/src/main/java/ru/mail/im/botapi/api/Messages.java +++ b/library/src/main/java/ru/mail/im/botapi/api/Messages.java @@ -38,6 +38,8 @@ ApiResponse editText( @RequestParam("chatId") final String chatId, @RequestParam("msgId") final long msgId, @RequestParam("text") final String newText, + @RequestParam("format") final String format, + @RequestParam("parseMode") final String parseMode, @RequestParam("inlineKeyboardMarkup") final List> keyboard ) throws IOException; diff --git a/library/src/main/java/ru/mail/im/botapi/api/entity/EditTextRequest.java b/library/src/main/java/ru/mail/im/botapi/api/entity/EditTextRequest.java index fe790d1..6bc3c82 100644 --- a/library/src/main/java/ru/mail/im/botapi/api/entity/EditTextRequest.java +++ b/library/src/main/java/ru/mail/im/botapi/api/entity/EditTextRequest.java @@ -6,6 +6,8 @@ public class EditTextRequest { private String chatId; private long msgId; private String newText; + private String format; + private String parseMode; private List> keyboard; public String getChatId() { @@ -43,4 +45,22 @@ public EditTextRequest setKeyboard(final List> keyboa this.keyboard = keyboard; return this; } + + public String getFormat() { + return format; + } + + public EditTextRequest setFormat(String format) { + this.format = format; + return this; + } + + public String getParseMode() { + return parseMode; + } + + public EditTextRequest setParseMode(String parseMode) { + this.parseMode = parseMode; + return this; + } } diff --git a/sample/src/main/java/ru/mail/im/botapi/sample/AppCommandHandler.java b/sample/src/main/java/ru/mail/im/botapi/sample/AppCommandHandler.java index 31b8e3c..72261b2 100644 --- a/sample/src/main/java/ru/mail/im/botapi/sample/AppCommandHandler.java +++ b/sample/src/main/java/ru/mail/im/botapi/sample/AppCommandHandler.java @@ -80,7 +80,7 @@ public void onSendVoice(final String chatId, final File file) { @Override public void onEditText(final String chatId, final long msgId, final String newText) { - api(client -> client.messages().editText(chatId, msgId, newText, null)); + api(client -> client.messages().editText(chatId, msgId, newText, null, null, null)); } @Override diff --git a/sample/src/main/java/ru/mail/im/botapi/sample/SimpleStart.java b/sample/src/main/java/ru/mail/im/botapi/sample/SimpleStart.java index d10a542..ed670a8 100644 --- a/sample/src/main/java/ru/mail/im/botapi/sample/SimpleStart.java +++ b/sample/src/main/java/ru/mail/im/botapi/sample/SimpleStart.java @@ -12,12 +12,14 @@ public class SimpleStart { public static void main(String[] args) throws IOException { Scanner scanner = new Scanner(System.in); + System.out.println("Enter API URL:"); + String apiUrl = scanner.nextLine(); System.out.println("Enter bot token:"); String token = scanner.nextLine(); System.out.println("Enter test chatId:"); String chatId = scanner.nextLine(); - BotApiClient client = new BotApiClient(token); + BotApiClient client = new BotApiClient(apiUrl, token); BotApiClientController controller = BotApiClientController.startBot(client); System.out.println("STARTED"); From 6eb186054942e8cccea20dbc619a82581cea50bb Mon Sep 17 00:00:00 2001 From: Denis Elkin Date: Fri, 23 Jan 2026 18:05:54 +0300 Subject: [PATCH 2/2] Update README.md for incoming minor version --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3bda85c..1a44728 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Group ids `io.github.mail-ru-im` and `ru.mail` will no longer being maintained. ru.mail.im bot-api - 1.2.3 + 1.2.4 ... @@ -41,7 +41,7 @@ repositories { } dependencies { - implementation 'ru.mail.im:bot-api:1.2.3' + implementation 'ru.mail.im:bot-api:1.2.4' } ``` @@ -117,6 +117,9 @@ client.stop(); // stop when work done ## Changelog +`1.2.4` +- Support text formats MarkdownV2 and HTML for EditTextRequest + `1.2.3` - Catch all exceptions in IOBackoff.execute