From 1e764dfaf279af14540fe1916c1847c7ec3d099c Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 6 Nov 2018 14:12:13 +0200 Subject: [PATCH 1/2] Allow hyphen character in switchPmParameter --- .../telegrambots/meta/api/methods/AnswerInlineQuery.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java index 80fb9434..5c341c80 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java @@ -136,8 +136,8 @@ public class AnswerInlineQuery extends BotApiMethod { if (switchPmParameter.length() > 64) { throw new TelegramApiValidationException("SwitchPmParameter can't be longer than 64 chars", this); } - if (!Pattern.matches("[A-Za-z0-9_]+", switchPmParameter.trim() )) { - throw new TelegramApiValidationException("SwitchPmParameter only allows A-Z, a-z, 0-9 and _ characters", this); + if (!Pattern.matches("[A-Za-z0-9_\\-]+", switchPmParameter.trim() )) { + throw new TelegramApiValidationException("SwitchPmParameter only allows A-Z, a-z, 0-9, _ and - characters", this); } } for (InlineQueryResult result : results) { From f133572a3ace763424887f8ef693465b3d6e0fcb Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 6 Nov 2018 16:40:50 +0200 Subject: [PATCH 2/2] Fix test case --- .../meta/test/apimethods/TestAnswerInlineQuery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java index 04f77a73..eea69669 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java @@ -113,7 +113,7 @@ public class TestAnswerInlineQuery { try { answerInlineQuery.validate(); } catch (TelegramApiValidationException e) { - Assert.assertEquals("SwitchPmParameter only allows A-Z, a-z, 0-9 and _ characters", e.getMessage()); + Assert.assertEquals("SwitchPmParameter only allows A-Z, a-z, 0-9, _ and - characters", e.getMessage()); } } }