Remove unnecessary fields

2 files changed, 3 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 185b014..69a7555 100755
--- a/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java
+++ b/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java
@@ -95,6 +95,6 @@ public class Bot {
     public static void sendAnime(UsersCallbackQuery usersCallbackQuery) {
         Anime[] anime = Anime.list;
         byte index = Anime.index;
-        TELEGRAM_BOT.execute(new SendPhoto(usersCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel()));
+        TELEGRAM_BOT.execute(new SendPhoto(usersCallbackQuery.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 3c22f67..764a753 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
@@ -18,11 +18,6 @@ import java.util.logging.Logger;
 
 public class UsersCallbackQuery {
     public CallbackQuery callbackQuery;
-    public String data;
-    public User user;
-    public long userId;
-    public int messageId;
-    public long chatId;
     private static final Logger LOGGER = Logger.getLogger(UsersCallbackQuery.class.getName());
 
     static {
@@ -31,15 +26,10 @@ public class UsersCallbackQuery {
 
     public UsersCallbackQuery(CallbackQuery callbackQuery) {
         this.callbackQuery = callbackQuery;
-        data = callbackQuery.data();
-        user = callbackQuery.from();
-        userId = callbackQuery.from().id();
-        messageId = callbackQuery.message().messageId();
-        chatId = callbackQuery.message().chat().id();
     }
 
     public void execute() throws IOException {
-        switch (data) {
+        switch (callbackQuery.data()) {
             case "previous" -> {
                 if (Anime.index == 0) {
                     Anime.setIndex((byte) (Anime.size-1));
@@ -86,7 +76,7 @@ public class UsersCallbackQuery {
             }
         }
 
-        Bot.TELEGRAM_BOT.execute(new DeleteMessage(chatId, messageId));
+        Bot.TELEGRAM_BOT.execute(new DeleteMessage(callbackQuery.message().chat().id(), callbackQuery.message().messageId()));
         LOGGER.fine("CallbackQuery is executed");
     }
 }