5 files changed, 35 insertions, 8 deletions
diff --git a/src/main/java/com/mavlushechka/animarfo/anime/Anime.java b/src/main/java/com/mavlushechka/animarfo/anime/Anime.java
index ed5e1ea..97564ab 100644..100755
--- a/src/main/java/com/mavlushechka/animarfo/anime/Anime.java
+++ b/src/main/java/com/mavlushechka/animarfo/anime/Anime.java
@@ -1,20 +1,35 @@
 package com.mavlushechka.animarfo.anime;
 
 public class Anime {
+
     private final String name;
+
     private final String description;
+
     private final String genres;
+
     private final String year;
+
     private final String series;
+
     private final String rating;
+
     public final String image;
+
     private final String url;
+
     public static String dub;
+
     public static String type;
+
     public static Anime[] list;
+
     public static byte index = 0;
+
     public static String searched;
+
     public static byte size;
+
     public static boolean isSearching;
 
     public Anime(String name, String description, String genres, String year, String series, String rating, String image, String url) {
diff --git a/src/main/java/com/mavlushechka/animarfo/parser/Parser.java b/src/main/java/com/mavlushechka/animarfo/parser/Parser.java
index a82ce0f..10f187c 100644..100755
--- a/src/main/java/com/mavlushechka/animarfo/parser/Parser.java
+++ b/src/main/java/com/mavlushechka/animarfo/parser/Parser.java
@@ -14,6 +14,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class Parser {
+
     private static final Logger LOGGER = Logger.getLogger(Parser.class.getName());
 
     static {
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 6dee032..a914227 100644..100755
--- a/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java
+++ b/src/main/java/com/mavlushechka/animarfo/telegram/bot/Bot.java
@@ -4,7 +4,7 @@ import com.mavlushechka.animarfo.App;
 import com.mavlushechka.animarfo.anime.Anime;
 import com.mavlushechka.animarfo.parser.Parser;
 import com.mavlushechka.animarfo.telegram.user.TelegramUser;
-import com.mavlushechka.animarfo.telegram.user.callbackquery.UserCallbackQuery;
+import com.mavlushechka.animarfo.telegram.user.callbackquery.UsersCallbackQuery;
 import com.mavlushechka.animarfo.telegram.user.keyboard.UserKeyboard;
 import com.mavlushechka.animarfo.telegram.user.message.UserMessage;
 import com.pengrad.telegrambot.TelegramBot;
@@ -37,7 +37,7 @@ public class Bot {
             updates.forEach(update -> {
                 if (update.callbackQuery() != null) {
                     try {
-                        UserCallbackQuery.execute(update.callbackQuery());
+                        UsersCallbackQuery.execute(update.callbackQuery());
                     } catch (IOException ioException) {
                         ioException.printStackTrace();
                     }
@@ -74,7 +74,7 @@ public class Bot {
     public static void sendAnimeByCallBackQuery() {
         Anime[] anime = Anime.list;
         byte index = Anime.index;
-        TELEGRAM_BOT.execute(new SendPhoto(UserCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel()));
+        TELEGRAM_BOT.execute(new SendPhoto(UsersCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel()));
     }
 
     public static void sendSearchedAnime() throws IOException {
diff --git a/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UserCallbackQuery.java b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java
index 1169ec0..3e22c09 100644..100755
--- a/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UserCallbackQuery.java
+++ b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java
@@ -16,14 +16,21 @@ import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQuery {
+public class UsersCallbackQuery {
+
     public static CallbackQuery callbackQuery;
+
     public static String data;
+
     public static User user;
+
     public static long userId;
+
     public static int messageId;
+
     public static long chatId;
-    private static final Logger LOGGER = Logger.getLogger(UserCallbackQuery.class.getName());
+
+    private static final Logger LOGGER = Logger.getLogger(UsersCallbackQuery.class.getName());
 
     static {
         LOGGER.setLevel(Level.ALL);
@@ -39,7 +46,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue
     }
 
     public static void execute(CallbackQuery callbackQuery) throws IOException {
-        UserCallbackQuery.setInformation(callbackQuery);
+        UsersCallbackQuery.setInformation(callbackQuery);
 
         switch (data) {
             case "previous" -> {
@@ -88,8 +95,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue
             }
         }
 
-        DeleteMessage deleteMessage = new DeleteMessage(chatId, messageId);
-        Bot.TELEGRAM_BOT.execute(deleteMessage);
+        Bot.TELEGRAM_BOT.execute(new DeleteMessage(chatId, messageId));
         LOGGER.fine("CallbackQuery is executed");
     }
 }
diff --git a/src/main/java/com/mavlushechka/animarfo/telegram/user/message/UserMessage.java b/src/main/java/com/mavlushechka/animarfo/telegram/user/message/UserMessage.java
index f134bde..e76e92c 100644..100755
--- a/src/main/java/com/mavlushechka/animarfo/telegram/user/message/UserMessage.java
+++ b/src/main/java/com/mavlushechka/animarfo/telegram/user/message/UserMessage.java
@@ -14,10 +14,15 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class UserMessage {
+
     public static Message message;
+
     public static String text;
+
     public static long chatId;
+
     private static final HashMap<String, String> animeTypes = new HashMap<>();
+
     private static final Logger LOGGER = Logger.getLogger(UserMessage.class.getName());
 
     static {