From 2c716133aa4feb9abd970c60cdbcda30955d1c19 Mon Sep 17 00:00:00 2001 From: Diego Schulz Date: Thu, 14 Sep 2017 12:39:48 -0400 Subject: [PATCH 1/2] Use a regular expression to split parameters This avoids the problem described in issue #304 --- .../telegrambots/bots/commandbot/commands/BotCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java index 02da6ebd..00f490db 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java @@ -11,7 +11,7 @@ import org.telegram.telegrambots.bots.AbsSender; */ public abstract class BotCommand { public final static String COMMAND_INIT_CHARACTER = "/"; - public static final String COMMAND_PARAMETER_SEPARATOR = " "; + public static final String COMMAND_PARAMETER_SEPARATOR_REGEXP = "\\s+"; private final static int COMMAND_MAX_LENGTH = 32; private final String commandIdentifier; @@ -75,4 +75,4 @@ public abstract class BotCommand { * @param arguments passed arguments */ public abstract void execute(AbsSender absSender, User user, Chat chat, String[] arguments); -} \ No newline at end of file +} From 17864c62398b6bc4c2052a46356adc79af4b04c8 Mon Sep 17 00:00:00 2001 From: Diego Schulz Date: Thu, 14 Sep 2017 12:45:20 -0400 Subject: [PATCH 2/2] Use a regular expression to split parameters --- .../bots/commandbot/commands/CommandRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java index 17da10d3..99858e3f 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java @@ -97,7 +97,7 @@ public final class CommandRegistry implements ICommandRegistry { String text = message.getText(); if (text.startsWith(BotCommand.COMMAND_INIT_CHARACTER)) { String commandMessage = text.substring(1); - String[] commandSplit = commandMessage.split(BotCommand.COMMAND_PARAMETER_SEPARATOR); + String[] commandSplit = commandMessage.split(BotCommand.COMMAND_PARAMETER_SEPARATOR_REGEXP); String command = removeUsernameFromCommandIfNeeded(commandSplit[0]); @@ -126,4 +126,4 @@ public final class CommandRegistry implements ICommandRegistry { } return command; } -} \ No newline at end of file +}