1 files changed, 36 insertions, 85 deletions

diff --git a/src/main/java/files/UserCallbackQuery.java b/src/main/java/files/UserCallbackQuery.java
index 553f6fd..f385542 100644
--- a/src/main/java/files/UserCallbackQuery.java
+++ b/src/main/java/files/UserCallbackQuery.java
@@ -1,14 +1,12 @@
 package files;
 
-import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.model.CallbackQuery;
-import com.pengrad.telegrambot.model.Update;
 import com.pengrad.telegrambot.model.User;
+import com.pengrad.telegrambot.model.request.Keyboard;
 import com.pengrad.telegrambot.model.request.ParseMode;
 import com.pengrad.telegrambot.request.DeleteMessage;
 import com.pengrad.telegrambot.request.SendMessage;
 import com.pengrad.telegrambot.request.SendPhoto;
-import files.entity.TelegramUser;
 
 import java.io.IOException;
 
@@ -17,116 +15,69 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue
     public static String data;
     public static User user;
     public static long userId;
-    public static String fullName;
     public static int messageId;
     public static long chatId;
 
-    public static void setInformation(CallbackQuery callbackQuery) {
-        UserCallbackQuery.callbackQuery = callbackQuery;
-        UserCallbackQuery.data = callbackQuery.data();
-        UserCallbackQuery.user = callbackQuery.from();
-        UserCallbackQuery.userId = callbackQuery.from().id();
-        UserCallbackQuery.fullName = callbackQuery.from().firstName() + TelegramUser.checkIfHasLastName(user);
-        UserCallbackQuery.messageId = callbackQuery.message().messageId();
-        UserCallbackQuery.chatId = callbackQuery.message().chat().id();
-    }
-
-    public static String getInformation() {
-        return "callbackQuery: " + callbackQuery + System.lineSeparator() +
-                "data: " + data + System.lineSeparator() +
-                "userId: " + userId + System.lineSeparator() +
-                "fullName: " + fullName + System.lineSeparator() +
-                "messageId: " + messageId + System.lineSeparator() +
-                "chatId: " + chatId + "\n\n";
-    }
-
-    public static boolean checkIfNotNull(CallbackQuery callbackQuery) {
-        return (callbackQuery != null);
+    public static void setInformation(CallbackQuery _callbackQuery) {
+        callbackQuery = _callbackQuery;
+        data = _callbackQuery.data();
+        user = _callbackQuery.from();
+        userId = _callbackQuery.from().id();
+        messageId = _callbackQuery.message().messageId();
+        chatId = _callbackQuery.message().chat().id();
     }
 
     public static void execute(CallbackQuery callbackQuery) throws IOException {
         UserCallbackQuery.setInformation(callbackQuery);
 
-        Bot.log.write(UserCallbackQuery.getInformation());
-        Bot.log.flush();
-
         switch (data) {
-            case "previousOngoing" -> {
+            case "previous" -> {
                 if (Anime.indexOfAnime == 0) {
-                    Anime.setIndexOfAnime((byte) 27);
+                    Anime.setIndexOfAnime((byte) (Anime.size-1));
                 } else {
                     Anime.decreaseIndexOfAnime();
                 }
-                Bot.sendAnimeAtMainMenuByCallBackQuery("Ongoing");
+                Bot.sendAnimeByCallBackQuery();
             }
-            case "nextOngoing" -> {
-                if (Anime.indexOfAnime == 27) {
+            case "next" -> {
+                if (Anime.indexOfAnime == Anime.size-1) {
                     Anime.setIndexOfAnime((byte) 0);
                 } else {
                     Anime.increaseIndexOfAnime();
                 }
-                Bot.sendAnimeAtMainMenuByCallBackQuery("Ongoing");
-            }
-            case "previousAnimeSerials" -> {
-                if (Anime.indexOfAnime == 0) {
-                    Anime.setIndexOfAnime((byte) 27);
-                } else {
-                    Anime.decreaseIndexOfAnime();
-                }
-                Bot.sendAnimeAtMainMenuByCallBackQuery("AnimeSerials");
-            }
-            case "nextAnimeSerials" -> {
-                if (Anime.indexOfAnime == 27) {
-                    Anime.setIndexOfAnime((byte) 0);
-                } else {
-                    Anime.increaseIndexOfAnime();
-                }
-                Bot.sendAnimeAtMainMenuByCallBackQuery("AnimeSerials");
-            }
-            case "previousAnimeFilms" -> {
-                if (Anime.indexOfAnime == 0) {
-                    Anime.setIndexOfAnime((byte) 27);
-                } else {
-                    Anime.decreaseIndexOfAnime();
-                }
-                Bot.sendAnimeAtMainMenuByCallBackQuery("AnimeFilms");
+                Bot.sendAnimeByCallBackQuery();
             }
-            case "nextAnimeFilms" -> {
-                if (Anime.indexOfAnime == 27) {
-                    Anime.setIndexOfAnime((byte) 0);
+            case "watchOrDownload" -> {
+                Anime[] anime = Anime.list;
+                byte index = Anime.indexOfAnime;
+                Keyboard anidub = MyKeyboard.getAnidub();
+                if (MyKeyboard.seriesSize > 0) {
+                    Bot.TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(anidub));
                 } else {
-                    Anime.increaseIndexOfAnime();
+                    Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я не смог найти серии для этого аниме... :("));
                 }
-                Bot.sendAnimeAtMainMenuByCallBackQuery("AnimeFilms");
             }
-            case "previousSearchedAnime" -> {
-                if (Anime.indexOfAnime == 0) {
-                    Anime.setIndexOfAnime((byte) (Anime.searchedAnimeSize - 1));
-                } else {
-                    Anime.decreaseIndexOfAnime();
+            case "anidub" -> {
+                Anime.dub = "Anidub";
+                String url = null;
+                if (Anime.typeOfAnime != null) {
+                    switch (Anime.typeOfAnime) {
+                        case "Ongoing" -> url = "https://anime.anidub.life/anime/anime_ongoing/";
+                        case "Serials" -> url = "https://online.anidub.com/anime/full/";
+                        case "Films" -> url = "https://anime.anidub.life/anime_movie/";
+                    }
                 }
-                Bot.sendSearchedAnimeByCallBackQuery(callbackQuery, Anime.indexOfAnime, Anime.list);
-            }
-            case "nextSearchedAnime" -> {
-                if (Anime.indexOfAnime == Anime.searchedAnimeSize - 1) {
-                    Anime.setIndexOfAnime((byte) 0);
+                Anime.setIndexOfAnime((byte) 0);
+                if (!Anime.isSearching) {
+                    Bot.sendAnime(url);
                 } else {
-                    Anime.increaseIndexOfAnime();
+                    Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Введи название аниме"));
                 }
-                Bot.sendSearchedAnimeByCallBackQuery(callbackQuery, Anime.indexOfAnime, Anime.list);
-            }
-            case "watchOrDownload" -> {
-                Bot.telegramBot.execute(new SendMessage(UserMessage.chatId, "Какую озвучку выберем?").replyMarkup(MyKeyboard.getDub()));
-            }
-            case "anidub" -> {
-                Anime[] anime = Anime.list;
-                byte index = Anime.indexOfAnime;
-                Anime thisAnime = anime[index];
-                Bot.telegramBot.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo("Anidub")).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getAnidub()));
+                Anime.typeOfAnime = null;
             }
         }
 
         DeleteMessage deleteMessage = new DeleteMessage(chatId, messageId);
-        Bot.telegramBot.execute(deleteMessage);
+        Bot.TELEGRAM_BOT.execute(deleteMessage);
     }
 }