diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index 3f3f64c..525ca85 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -104,6 +104,9 @@ public class WeatherHandlers implements UpdatesCallback { private static void handleIncomingMessage(Message message) { final int state = DatabaseManager.getInstance().getWeatherState(message.getFrom().getId(), message.getChatId()); final String language = DatabaseManager.getInstance().getUserWeatherOptions(message.getFrom().getId())[0]; + if (message.isGroupMessage() && message.hasText() && isCommandForOther(message.getText())) { + return; + } switch(state) { case MAINMENU: messageOnMainMenu(message, language); @@ -138,6 +141,12 @@ public class WeatherHandlers implements UpdatesCallback { } } + private static boolean isCommandForOther(String text) { + boolean isSimpleCommand = text.equals("/start") || text.equals("/help"); + boolean isCommandForMe = text.equals("/start@weatherbot") || text.equals("/help@weatherbot"); + return !isSimpleCommand && !isCommandForMe; + } + // endregion Incoming messages handlers // region Alerts Menu Option selected