diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/CommandBot.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/CommandBot.java index 29e3dd1f..1164aac2 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/CommandBot.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/CommandBot.java @@ -24,7 +24,9 @@ public interface CommandBot { * * @param update Received update from Telegram */ - void processInvalidCommandUpdate(Update update); + default void processInvalidCommandUpdate(Update update) { + processNonCommandUpdate(update); + } /** * Override this function in your bot implementation to filter messages with commands @@ -39,5 +41,7 @@ public interface CommandBot { * false otherwise * @note Default implementation doesn't filter anything */ - boolean filter(Message message); + default boolean filter(Message message) { + return false; + } } diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramLongPollingCommandBot.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramLongPollingCommandBot.java index 44e03c95..d55a4fe4 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramLongPollingCommandBot.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramLongPollingCommandBot.java @@ -70,16 +70,6 @@ public abstract class TelegramLongPollingCommandBot extends TelegramLongPollingB processNonCommandUpdate(update); } - @Override - public void processInvalidCommandUpdate(Update update) { - processNonCommandUpdate(update); - } - - @Override - public boolean filter(Message message) { - return false; - } - @Override public final boolean register(IBotCommand botCommand) { return commandRegistry.register(botCommand); diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramWebhookCommandBot.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramWebhookCommandBot.java index 2b49e5e6..dcc37380 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramWebhookCommandBot.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/TelegramWebhookCommandBot.java @@ -72,16 +72,6 @@ public abstract class TelegramWebhookCommandBot extends TelegramWebhookBot imple return null; } - @Override - public void processInvalidCommandUpdate(Update update) { - processNonCommandUpdate(update); - } - - @Override - public boolean filter(Message message) { - return false; - } - @Override public final boolean register(IBotCommand botCommand) { return commandRegistry.register(botCommand); @@ -116,10 +106,4 @@ public abstract class TelegramWebhookCommandBot extends TelegramWebhookBot imple public final IBotCommand getRegisteredCommand(String commandIdentifier) { return commandRegistry.getRegisteredCommand(commandIdentifier); } - - /** - * @return Bot username - */ - @Override - public abstract String getBotUsername(); }