fifteenths commit

1 files changed, 17 insertions, 52 deletions

diff --git a/src/main/java/files/Bot.java b/src/main/java/files/Bot.java
index a533ebd..55eff9b 100644
--- a/src/main/java/files/Bot.java
+++ b/src/main/java/files/Bot.java
@@ -20,54 +20,22 @@ public class Bot {
         // Creating telegram bot
         TelegramBot telegramBot = new TelegramBot(properties.getProperty("TELEGRAM_TOKEN"));
 
+        // Setting updates listener
         telegramBot.setUpdatesListener(updates -> {
             updates.forEach(update -> {
                 if (UserCallbackQuery.checkIfNotNull(update.callbackQuery())) {
                     UserCallbackQuery.setInformation(update.callbackQuery());
                     UserCallbackQuery.execute(telegramBot);
-                } else if (update.message() != null && update.message().text().equals("Поиск аниме")) {
-                    Anime.setIndexOfAnime((byte) 0);
-                    Anime.setIsSearchingAnAnime(true);
-                    telegramBot.execute(new SendMessage(update.message().chat().id(), "Введи название аниме, которое хочешь найти..."));
-                } else if (update.message() != null && update.message().text().equals("Недавно добавленные аниме")) {
-                    Anime.setIndexOfAnime((byte) 0);
-                    Anime.setIsSearchingAnAnime(false);
-                    try {
-                        Bot.showRecentlyAddedAnime(telegramBot, update, Anime.getIndexOfAnime());
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                } else if (update.message() != null && update.message().text().equals("Новинки аниме")) {
-                    Anime.setIndexOfAnime((byte) 0);
-                    Anime.setIsSearchingAnAnime(false);
-                    try {
-                        Bot.showRecentlyReleasedAnime(telegramBot, update, Anime.getIndexOfAnime());
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                } else if (update.message() != null && update.message().text().equals("/start")) {
-//                    DataBase.saveUser(update);
-                    Anime.setIsSearchingAnAnime(false);
-                    telegramBot.execute(new SendMessage(update.message().chat().id(), ("Приветики " + update.message().from().firstName() + ", меня звать AniMarfo!\nЯ помогу тебе найти аниме, скачать его или же смотреть прямо тут.")).replyMarkup(MyKeyboard.getMain()));
-                } else if (update.message() != null) {
-                    if (Anime.getIsSearchingAnAnime()) {
-                        Anime.setSearchedAnime(update.message().text());
-                        Anime.setIsSearchingAnAnime(false);
-                        try {
-                            Bot.showSearchedAnime(telegramBot, update, Anime.getIndexOfAnime(), Anime.getSearchedAnime());
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    } else {
-                        telegramBot.execute(new SendMessage(update.message().chat().id(), "Прости, но я тебя не понимаю...\nВоспользуйся командами на твоей клавлиатуре!").replyMarkup(MyKeyboard.getMain()));
-                    }
+                } else if (UserMessage.checkIfNotNull(update.message())) {
+                    UserMessage.setInformation(update.message());
+                    UserMessage.execute(telegramBot, update);
                 }
             });
             return UpdatesListener.CONFIRMED_UPDATES_ALL;
         });
     }
 
-    private static void showAnimeAtMainMenu(TelegramBot telegramBot, Update update, byte index, String url, String typeOfAnime) throws IOException {
+    public static void showAnimeAtMainMenu(TelegramBot telegramBot, Update update, byte index, String url, String typeOfAnime) throws IOException {
         Anime[] anime = new Anime[Parser.getAnimeAtSearchSize(url)];
         try {
             anime = Parser.getAnimeAtMainMenu(url);
@@ -78,18 +46,21 @@ public class Bot {
         telegramBot.execute(new SendPhoto(update.message().chat().id(), anime[index].getImage()).caption(anime[index].showInfo()).replyMarkup(MyKeyboard.getCarousel(typeOfAnime)));
     }
 
-    private static void showAnimeAtMainMenuCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index, String typeOfAnime, Anime[] list) {
+    public static void showAnimeAtMainMenuByCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index, String typeOfAnime, Anime[] list) {
         telegramBot.execute(new SendPhoto(callbackQuery.message().chat().id(), list[index].getImage()).caption(list[index].showInfo()).replyMarkup(MyKeyboard.getCarousel(typeOfAnime)));
-   }
+    }
 
     public static void showSearchedAnime(TelegramBot telegramBot, Update update, byte index, String searchedAnime) throws IOException {
-        if (Parser.getAnimeAtSearchSize("https://animego.org/search/all?q=" + searchedAnime) > 0) {
+        byte animeAtSearchSize = Parser.getAnimeAtSearchSize("https://animego.org/search/all?q=" + searchedAnime);
+        if (animeAtSearchSize > 0) {
             Anime[] anime = new Anime[Parser.getAnimeAtSearchSize("https://animego.org/search/all?q=" + searchedAnime)];
             try {
                 anime = Parser.getAnimeAtSearch("https://animego.org/search/all?q=" + searchedAnime);
             } catch (IOException e) {
                 e.printStackTrace();
             }
+            Anime.setSearchedAnimeSize(animeAtSearchSize);
+            Anime.setList(anime);
             telegramBot.execute(new SendPhoto(update.message().chat().id(), anime[index].getImage()).caption(anime[index].showInfo()).replyMarkup(MyKeyboard.getCarousel("SearchedAnime")));
         } else {
             telegramBot.execute(new SendMessage(update.message().chat().id(), "Прости, но я не смог найти аниме с таким названием...\nДавай поищем другое аниме!"));
@@ -97,29 +68,23 @@ public class Bot {
         }
     }
 
-    public static void showSearchedAnimeCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index, String searchedAnime) {
-        Anime[] anime = new Anime[20];
-        try {
-            anime = Parser.getAnimeAtSearch("https://animego.org/search/all?q=" + searchedAnime);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        telegramBot.execute(new SendPhoto(callbackQuery.message().chat().id(), anime[index].getImage()).caption(anime[index].showInfo()).replyMarkup(MyKeyboard.getCarousel("SearchedAnime")));
+    public static void showSearchedAnimeByCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index, Anime[] list) {
+        telegramBot.execute(new SendPhoto(callbackQuery.message().chat().id(), list[index].getImage()).caption(list[index].showInfo()).replyMarkup(MyKeyboard.getCarousel("SearchedAnime")));
     }
 
     public static void showRecentlyAddedAnime(TelegramBot telegramBot, Update update, byte index) throws IOException {
         showAnimeAtMainMenu(telegramBot, update, index, "https://animego.org/anime?sort=a.createdAt&direction=desc", "RecentlyAddedAnime");
     }
 
-    public static void showRecentlyAddedAnimeCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index) {
-        showAnimeAtMainMenuCallBackQuery(telegramBot, callbackQuery, index,"RecentlyAddedAnime", Anime.getList());
+    public static void showRecentlyAddedAnimeByCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index) {
+        showAnimeAtMainMenuByCallBackQuery(telegramBot, callbackQuery, index,"RecentlyAddedAnime", Anime.getList());
     }
 
     public static void showRecentlyReleasedAnime(TelegramBot telegramBot, Update update, byte index) throws IOException {
         showAnimeAtMainMenu(telegramBot, update, index, "https://animego.org/anime?sort=a.startDate&direction=desc", "RecentlyReleasedAnime");
     }
 
-    public static void showRecentlyReleasedAnimeCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index) {
-        showAnimeAtMainMenuCallBackQuery(telegramBot, callbackQuery, index,"RecentlyReleasedAnime", Anime.getList());
+    public static void showRecentlyReleasedAnimeByCallBackQuery(TelegramBot telegramBot, CallbackQuery callbackQuery, byte index) {
+        showAnimeAtMainMenuByCallBackQuery(telegramBot, callbackQuery, index,"RecentlyReleasedAnime", Anime.getList());
     }
 }