diff options
Diffstat (limited to 'src/main/java/com/mavlushechka/animarfo')
-rwxr-xr-x[-rw-r--r--] | src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java | 6 | ||||
-rwxr-xr-x | src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java b/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java index 6dee032..a914227 100644..100755 --- a/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java +++ b/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java @@ -4,7 +4,7 @@ import com.mavlushechka.animarfo.App; import com.mavlushechka.animarfo.anime.Anime; import com.mavlushechka.animarfo.parser.Parser; import com.mavlushechka.animarfo.telegram.user.TelegramUser; -import com.mavlushechka.animarfo.telegram.user.callbackquery.UserCallbackQuery; +import com.mavlushechka.animarfo.telegram.user.callbackquery.UsersCallbackQuery; import com.mavlushechka.animarfo.telegram.user.keyboard.UserKeyboard; import com.mavlushechka.animarfo.telegram.user.message.UserMessage; import com.pengrad.telegrambot.TelegramBot; @@ -37,7 +37,7 @@ public class Bot { updates.forEach(update -> { if (update.callbackQuery() != null) { try { - UserCallbackQuery.execute(update.callbackQuery()); + UsersCallbackQuery.execute(update.callbackQuery()); } catch (IOException ioException) { ioException.printStackTrace(); } @@ -74,7 +74,7 @@ public class Bot { public static void sendAnimeByCallBackQuery() { Anime[] anime = Anime.list; byte index = Anime.index; - TELEGRAM_BOT.execute(new SendPhoto(UserCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel())); + TELEGRAM_BOT.execute(new SendPhoto(UsersCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel())); } public static void sendSearchedAnime() throws IOException { diff --git a/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java index 4ca33d2..3e22c09 100755 --- a/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java +++ b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java @@ -16,7 +16,8 @@ import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQuery { +public class UsersCallbackQuery { + public static CallbackQuery callbackQuery; public static String data; @@ -28,7 +29,8 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue public static int messageId; public static long chatId; - private static final Logger LOGGER = Logger.getLogger(UserCallbackQuery.class.getName()); + + private static final Logger LOGGER = Logger.getLogger(UsersCallbackQuery.class.getName()); static { LOGGER.setLevel(Level.ALL); @@ -44,7 +46,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue } public static void execute(CallbackQuery callbackQuery) throws IOException { - UserCallbackQuery.setInformation(callbackQuery); + UsersCallbackQuery.setInformation(callbackQuery); switch (data) { case "previous" -> { @@ -93,8 +95,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue } } - DeleteMessage deleteMessage = new DeleteMessage(chatId, messageId); - Bot.TELEGRAM_BOT.execute(deleteMessage); + Bot.TELEGRAM_BOT.execute(new DeleteMessage(chatId, messageId)); LOGGER.fine("CallbackQuery is executed"); } } |