1 files changed, 11 insertions, 21 deletions
diff --git a/src/main/java/files/UserCallbackQuery.java b/src/main/java/files/UserCallbackQuery.java
index 92f2391..7a297a8 100644
--- a/src/main/java/files/UserCallbackQuery.java
+++ b/src/main/java/files/UserCallbackQuery.java
@@ -5,8 +5,6 @@ import com.pengrad.telegrambot.model.CallbackQuery;
 import com.pengrad.telegrambot.model.User;
 import com.pengrad.telegrambot.request.DeleteMessage;
 
-import java.io.IOException;
-
 public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQuery {
     private static CallbackQuery callbackQuery;
     private static String data;
@@ -33,7 +31,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue
             } else {
                 Anime.decreaseIndexOfAnime();
             }
-            Bot.showRecentlyAddedAnimeCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
+            Bot.showRecentlyAddedAnimeByCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
         }
         if (data.equals("nextRecentlyAddedAnime")) {
             if (Anime.getIndexOfAnime() == 19) {
@@ -41,7 +39,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue
             } else {
                 Anime.increaseIndexOfAnime();
             }
-            Bot.showRecentlyAddedAnimeCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
+            Bot.showRecentlyAddedAnimeByCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
         }
 
         if (data.equals("previousRecentlyReleasedAnime")) {
@@ -50,7 +48,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue
             } else {
                 Anime.decreaseIndexOfAnime();
             }
-            Bot.showRecentlyReleasedAnimeCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
+            Bot.showRecentlyReleasedAnimeByCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
         }
         if (data.equals("nextRecentlyReleasedAnime")) {
             if (Anime.getIndexOfAnime() == 19) {
@@ -58,32 +56,24 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue
             } else {
                 Anime.increaseIndexOfAnime();
             }
-            Bot.showRecentlyReleasedAnimeCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
+            Bot.showRecentlyReleasedAnimeByCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime());
         }
 
         if (data.equals("previousSearchedAnime")) {
             if (Anime.getIndexOfAnime() == 0) {
-                try {
-                    Anime.setIndexOfAnime((byte) ((Parser.getAnimeAtSearchSize("https://animego.org/search/all?q=" + Anime.getSearchedAnime())) - 1));
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+                Anime.setIndexOfAnime((byte) (Anime.getSearchedAnimeSize() - 1));
             } else {
                 Anime.decreaseIndexOfAnime();
             }
-            Bot.showSearchedAnimeCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime(), Anime.getSearchedAnime());
+            Bot.showSearchedAnimeByCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime(), Anime.getList());
         }
         if (data.equals("nextSearchedAnime")) {
-            try {
-                if (Anime.getIndexOfAnime() == Parser.getAnimeAtSearchSize("https://animego.org/search/all?q=" + Anime.getSearchedAnime()) - 1) {
-                    Anime.setIndexOfAnime((byte) 0);
-                } else {
-                    Anime.increaseIndexOfAnime();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
+            if (Anime.getIndexOfAnime() == Anime.getSearchedAnimeSize() - 1) {
+                Anime.setIndexOfAnime((byte) 0);
+            } else {
+                Anime.increaseIndexOfAnime();
             }
-            Bot.showSearchedAnimeCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime(), Anime.getSearchedAnime());
+            Bot.showSearchedAnimeByCallBackQuery(telegramBot, callbackQuery, Anime.getIndexOfAnime(), Anime.getList());
         }
 
         DeleteMessage deleteMessage = new DeleteMessage(chatId, messageId);