eighteenth commit

1 files changed, 33 insertions, 30 deletions

diff --git a/src/main/java/files/Bot.java b/src/main/java/files/Bot.java
index c1cff05..6c7a521 100644
--- a/src/main/java/files/Bot.java
+++ b/src/main/java/files/Bot.java
@@ -2,35 +2,40 @@ package files;
 
 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;
 import com.pengrad.telegrambot.request.SendPhoto;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.Properties;
 
-// TODO: 7/25/21 Добавить поиск Аниме OVA, аниме по жанру, Дорамы, случайное аниме
+// TODO: 7/25/21 Добавить Аниме OVA, аниме по жанру, Дорамы, случайное аниме
 
 public class Bot {
+    public final static Properties PROPERTIES = loadProperties(new File("app.properties"));
+    public final static TelegramBot TELEGRAM_BOT = new TelegramBot(PROPERTIES.getProperty("TELEGRAM_TOKEN"));
+    public static TelegramUser telegramUser = new TelegramUser();
 
-    public static Properties properties = loadProperties(new File("app.properties"));
-    public static TelegramBot telegramBot = new TelegramBot(properties.getProperty("TELEGRAM_TOKEN"));
-    public static FileWriter log;
-
-    public static void main(String[] args) throws IOException {
-        log = new FileWriter("log.txt", false);
-
-        telegramBot.setUpdatesListener(updates -> {
+    public static void main(String[] args) {
+        TELEGRAM_BOT.setUpdatesListener(updates -> {
             updates.forEach(update -> {
-                if (UserCallbackQuery.checkIfNotNull(update.callbackQuery())) {
+                if (update.callbackQuery() != null) {
                     try {
                         UserCallbackQuery.execute(update.callbackQuery());
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
                 }
-                if (UserMessage.checkIfNotNull(update.message())) {
+                if (update.message() != null) {
+                    User user = update.message().from();
+                    SimpleDateFormat simpleDateFormat = new java.text.SimpleDateFormat("dd.MM.yyyy HH:mm:ss z");
+                    simpleDateFormat.setTimeZone(java.util.TimeZone.getTimeZone("GMT+5"));
+                    String formattedDate = simpleDateFormat.format(new java.util.Date(update.message().date() * 1000L));
+                    telegramUser = new TelegramUser(user.id(), user.isBot(), user.firstName(), user.lastName(), user.username(), formattedDate);
                     try {
                         UserMessage.execute(update.message());
                     } catch (IOException e) {
@@ -52,43 +57,41 @@ public class Bot {
         return properties;
     }
 
-    public static void sendAnimeAtMainMenu(String url, String typeOfAnime) {
+    public static void sendAnime(String url) {
         Anime[] anime = new Anime[28];
         byte index = Anime.indexOfAnime;
         try {
-            anime = Parse.getAnimeAtMainMenu(url, typeOfAnime);
+            anime = Parser.getAnime(url);
         } catch (IOException e) {
             e.printStackTrace();
         }
         Anime.setList(anime);
-        telegramBot.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel(typeOfAnime)));
+        TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel()));
     }
 
-    public static void sendAnimeAtMainMenuByCallBackQuery(String typeOfAnime) {
+    public static void sendAnimeByCallBackQuery() {
         Anime[] anime = Anime.list;
         byte index = Anime.indexOfAnime;
-        telegramBot.execute(new SendPhoto(UserCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel(typeOfAnime)));
+        TELEGRAM_BOT.execute(new SendPhoto(UserCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel()));
     }
 
-    public static void sendSearchedAnime(byte index, String searchedAnime) throws IOException {
-        byte animeAtSearchSize = Parse.getAnimeAtSearchSize("https://animego.org/search/all?q=" + searchedAnime);
+    public static void sendSearchedAnime() throws IOException {
+        String searchedAnime = Anime.searchedAnime;
+        byte index = Anime.indexOfAnime;
+        byte animeAtSearchSize = Parser.getSizeOfSearchedAnime("https://anime.anidub.life/?do=search&mode=advanced&subaction=search&titleonly=3&story=" + searchedAnime);
         if (animeAtSearchSize > 0) {
-            Anime[] anime = new Anime[Parse.getAnimeAtSearchSize("https://animego.org/search/all?q=" + searchedAnime)];
+            Anime[] anime = new Anime[animeAtSearchSize];
             try {
-                anime = Parse.getAnimeAtSearch("https://animego.org/search/all?q=" + searchedAnime);
+                anime = Parser.getAnime("https://anime.anidub.life/?do=search&mode=advanced&subaction=search&titleonly=3&story=" + searchedAnime);
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            Anime.setSearchedAnimeSize(animeAtSearchSize);
+            Anime.size = animeAtSearchSize;
             Anime.setList(anime);
-            telegramBot.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel("SearchedAnime")));
+            TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel()));
         } else {
-            telegramBot.execute(new SendMessage(UserMessage.chatId, "Прости, но я не смог найти аниме с таким названием...\nДавай поищем другое аниме!"));
-            Anime.setIsSearchingAnAnime(true);
+            TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я не смог найти аниме с таким названием...\nДавай поищем другое аниме!"));
+            Anime.isSearching = true;
         }
     }
-
-    public static void sendSearchedAnimeByCallBackQuery(CallbackQuery callbackQuery, byte index, Anime[] list) {
-        telegramBot.execute(new SendPhoto(callbackQuery.message().chat().id(), list[index].getImage()).caption(list[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel("SearchedAnime")));
-    }
 }