From a995f63385e1b08cc86a6516c7fcfd33a4ea98c2 Mon Sep 17 00:00:00 2001 From: mavlushechka Date: Sun, 7 Nov 2021 18:56:31 +0500 Subject: Added empty lines between variable instances --- .../com/mavlushechka/animarfo/anime/Anime.java | 15 ++++ .../com/mavlushechka/animarfo/parser/Parser.java | 1 + .../user/callbackquery/UserCallbackQuery.java | 95 -------------------- .../user/callbackquery/UsersCallbackQuery.java | 100 +++++++++++++++++++++ .../telegram/user/message/UserMessage.java | 5 ++ 5 files changed, 121 insertions(+), 95 deletions(-) mode change 100644 => 100755 src/main/java/com/mavlushechka/animarfo/anime/Anime.java mode change 100644 => 100755 src/main/java/com/mavlushechka/animarfo/parser/Parser.java delete mode 100644 src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UserCallbackQuery.java create mode 100755 src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java mode change 100644 => 100755 src/main/java/com/mavlushechka/animarfo/telegram/user/message/UserMessage.java (limited to 'src/main/java/com/mavlushechka/animarfo') diff --git a/src/main/java/com/mavlushechka/animarfo/anime/Anime.java b/src/main/java/com/mavlushechka/animarfo/anime/Anime.java old mode 100644 new mode 100755 index ed5e1ea..97564ab --- 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 old mode 100644 new mode 100755 index a82ce0f..10f187c --- 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/user/callbackquery/UserCallbackQuery.java b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UserCallbackQuery.java deleted file mode 100644 index 1169ec0..0000000 --- a/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UserCallbackQuery.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.mavlushechka.animarfo.telegram.user.callbackquery; - -import com.mavlushechka.animarfo.anime.Anime; -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; -import com.pengrad.telegrambot.request.SendMessage; -import com.pengrad.telegrambot.request.SendPhoto; - -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQuery { - 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()); - - static { - LOGGER.setLevel(Level.ALL); - } - - public static void setInformation(CallbackQuery _callbackQuery) { - callbackQuery = _callbackQuery; - data = _callbackQuery.data(); - user = _callbackQuery.from(); - userId = _callbackQuery.from().id(); - messageId = _callbackQuery.message().messageId(); - chatId = _callbackQuery.message().chat().id(); - } - - public static void execute(CallbackQuery callbackQuery) throws IOException { - UserCallbackQuery.setInformation(callbackQuery); - - switch (data) { - case "previous" -> { - if (Anime.index == 0) { - Anime.setIndex((byte) (Anime.size-1)); - } else { - Anime.decreaseIndexOfAnime(); - } - Bot.sendAnimeByCallBackQuery(); - } - case "next" -> { - if (Anime.index == Anime.size-1) { - Anime.setIndex((byte) 0); - } else { - Anime.increaseIndexOfAnime(); - } - Bot.sendAnimeByCallBackQuery(); - } - case "watchOrDownload" -> { - Anime[] anime = Anime.list; - byte index = Anime.index; - Keyboard anidub = UserKeyboard.getAnidub(); - if (UserKeyboard.seriesSize > 0) { - Bot.TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(anidub)); - } else { - Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я не смог найти серии для этого аниме... :(")); - } - } - case "anidub" -> { - Anime.dub = "Anidub"; - String url = null; - if (Anime.type != null) { - switch (Anime.type) { - case "Ongoing" -> url = "https://online.anidub.com/anime/anime_ongoing/"; - case "Serials" -> url = "https://online.anidub.com/anime/full/"; - case "Films" -> url = "https://online.anidub.com/anime_movie/"; - } - } - Anime.setIndex((byte) 0); - if (!Anime.isSearching) { - Bot.sendAnime(url); - } else { - Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Введи название аниме")); - } - Anime.type = null; - } - } - - DeleteMessage deleteMessage = new DeleteMessage(chatId, messageId); - Bot.TELEGRAM_BOT.execute(deleteMessage); - LOGGER.fine("CallbackQuery is executed"); - } -} 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 new file mode 100755 index 0000000..4ca33d2 --- /dev/null +++ b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java @@ -0,0 +1,100 @@ +package com.mavlushechka.animarfo.telegram.user.callbackquery; + +import com.mavlushechka.animarfo.anime.Anime; +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; +import com.pengrad.telegrambot.request.SendMessage; +import com.pengrad.telegrambot.request.SendPhoto; + +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQuery { + 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()); + + static { + LOGGER.setLevel(Level.ALL); + } + + public static void setInformation(CallbackQuery _callbackQuery) { + callbackQuery = _callbackQuery; + data = _callbackQuery.data(); + user = _callbackQuery.from(); + userId = _callbackQuery.from().id(); + messageId = _callbackQuery.message().messageId(); + chatId = _callbackQuery.message().chat().id(); + } + + public static void execute(CallbackQuery callbackQuery) throws IOException { + UserCallbackQuery.setInformation(callbackQuery); + + switch (data) { + case "previous" -> { + if (Anime.index == 0) { + Anime.setIndex((byte) (Anime.size-1)); + } else { + Anime.decreaseIndexOfAnime(); + } + Bot.sendAnimeByCallBackQuery(); + } + case "next" -> { + if (Anime.index == Anime.size-1) { + Anime.setIndex((byte) 0); + } else { + Anime.increaseIndexOfAnime(); + } + Bot.sendAnimeByCallBackQuery(); + } + case "watchOrDownload" -> { + Anime[] anime = Anime.list; + byte index = Anime.index; + Keyboard anidub = UserKeyboard.getAnidub(); + if (UserKeyboard.seriesSize > 0) { + Bot.TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(anidub)); + } else { + Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я не смог найти серии для этого аниме... :(")); + } + } + case "anidub" -> { + Anime.dub = "Anidub"; + String url = null; + if (Anime.type != null) { + switch (Anime.type) { + case "Ongoing" -> url = "https://online.anidub.com/anime/anime_ongoing/"; + case "Serials" -> url = "https://online.anidub.com/anime/full/"; + case "Films" -> url = "https://online.anidub.com/anime_movie/"; + } + } + Anime.setIndex((byte) 0); + if (!Anime.isSearching) { + Bot.sendAnime(url); + } else { + Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Введи название аниме")); + } + Anime.type = null; + } + } + + DeleteMessage deleteMessage = new DeleteMessage(chatId, messageId); + Bot.TELEGRAM_BOT.execute(deleteMessage); + 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 old mode 100644 new mode 100755 index f134bde..e76e92c --- 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 animeTypes = new HashMap<>(); + private static final Logger LOGGER = Logger.getLogger(UserMessage.class.getName()); static { -- cgit v1.2.3