Remove unnecessary field

2 files changed, 7 insertions, 13 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 69a7555..f399c7e 100755
--- a/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java
+++ b/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java
@@ -9,6 +9,7 @@ import com.mavlushechka.animarfo.telegram.user.keyboard.UserKeyboard;
 import com.mavlushechka.animarfo.telegram.user.message.UserMessage;
 import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.UpdatesListener;
+import com.pengrad.telegrambot.model.CallbackQuery;
 import com.pengrad.telegrambot.model.User;
 import com.pengrad.telegrambot.model.request.ParseMode;
 import com.pengrad.telegrambot.request.SendMessage;
@@ -36,8 +37,7 @@ public class Bot {
             updates.forEach(update -> {
                 if (update.callbackQuery() != null) {
                     try {
-                        UsersCallbackQuery usersCallbackQuery = new UsersCallbackQuery(update.callbackQuery());
-                        usersCallbackQuery.execute();
+                        UsersCallbackQuery.execute(update.callbackQuery());
                     } catch (IOException ioException) {
                         ioException.printStackTrace();
                     }
@@ -92,9 +92,9 @@ public class Bot {
         TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel()));
     }
 
-    public static void sendAnime(UsersCallbackQuery usersCallbackQuery) {
+    public static void sendAnime(CallbackQuery callbackQuery) {
         Anime[] anime = Anime.list;
         byte index = Anime.index;
-        TELEGRAM_BOT.execute(new SendPhoto(usersCallbackQuery.callbackQuery.message().chat().id(), anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel()));
+        TELEGRAM_BOT.execute(new SendPhoto(callbackQuery.message().chat().id(), anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel()));
     }
 }
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 764a753..c66bbfa 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
@@ -5,7 +5,6 @@ import com.mavlushechka.animarfo.telegram.bot.Bot;
 import com.mavlushechka.animarfo.telegram.user.keyboard.UserKeyboard;
 import com.mavlushechka.animarfo.telegram.user.message.UserMessage;
 import com.pengrad.telegrambot.model.CallbackQuery;
-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;
@@ -17,18 +16,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class UsersCallbackQuery {
-    public CallbackQuery callbackQuery;
     private static final Logger LOGGER = Logger.getLogger(UsersCallbackQuery.class.getName());
 
     static {
         LOGGER.setLevel(Level.ALL);
     }
 
-    public UsersCallbackQuery(CallbackQuery callbackQuery) {
-        this.callbackQuery = callbackQuery;
-    }
-
-    public void execute() throws IOException {
+    public static void execute(CallbackQuery callbackQuery) throws IOException {
         switch (callbackQuery.data()) {
             case "previous" -> {
                 if (Anime.index == 0) {
@@ -36,7 +30,7 @@ public class UsersCallbackQuery {
                 } else {
                     Anime.decreaseIndexOfAnime();
                 }
-                Bot.sendAnime(this);
+                Bot.sendAnime(callbackQuery);
             }
             case "next" -> {
                 if (Anime.index == Anime.size-1) {
@@ -44,7 +38,7 @@ public class UsersCallbackQuery {
                 } else {
                     Anime.increaseIndexOfAnime();
                 }
-                Bot.sendAnime(this);
+                Bot.sendAnime(callbackQuery);
             }
             case "watchOrDownload" -> {
                 Anime[] anime = Anime.list;