From b6c235dfd453850a478ad4ffe7d334f87427ad9f Mon Sep 17 00:00:00 2001 From: mavlonerkinboev Date: Tue, 27 Jul 2021 09:44:01 +0500 Subject: just another commit... --- src/main/java/files/Bot.java | 6 +-- src/main/java/files/MyKeyboard.java | 87 ------------------------------ src/main/java/files/UserCallbackQuery.java | 4 +- src/main/java/files/UserKeyboard.java | 87 ++++++++++++++++++++++++++++++ src/main/java/files/UserMessage.java | 6 +-- 5 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 src/main/java/files/MyKeyboard.java create mode 100644 src/main/java/files/UserKeyboard.java (limited to 'src/main/java/files') diff --git a/src/main/java/files/Bot.java b/src/main/java/files/Bot.java index 6c7a521..15baa1c 100644 --- a/src/main/java/files/Bot.java +++ b/src/main/java/files/Bot.java @@ -66,13 +66,13 @@ public class Bot { e.printStackTrace(); } Anime.setList(anime); - TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel())); + TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel())); } public static void sendAnimeByCallBackQuery() { Anime[] anime = Anime.list; byte index = Anime.indexOfAnime; - TELEGRAM_BOT.execute(new SendPhoto(UserCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel())); + TELEGRAM_BOT.execute(new SendPhoto(UserCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel())); } public static void sendSearchedAnime() throws IOException { @@ -88,7 +88,7 @@ public class Bot { } Anime.size = animeAtSearchSize; Anime.setList(anime); - TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(MyKeyboard.getCarousel())); + TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel())); } else { TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я не смог найти аниме с таким названием...\nДавай поищем другое аниме!")); Anime.isSearching = true; diff --git a/src/main/java/files/MyKeyboard.java b/src/main/java/files/MyKeyboard.java deleted file mode 100644 index 060ceb5..0000000 --- a/src/main/java/files/MyKeyboard.java +++ /dev/null @@ -1,87 +0,0 @@ -package files; - -import com.pengrad.telegrambot.model.request.Keyboard; -import com.pengrad.telegrambot.model.request.InlineKeyboardButton; -import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup; -import com.pengrad.telegrambot.model.request.ReplyKeyboardMarkup; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; - -import java.io.IOException; -import java.util.ArrayList; - -public class MyKeyboard { - public static short seriesSize; - - public static Keyboard getMain() { - return new ReplyKeyboardMarkup( - new String[]{"Поиск аниме"}, - new String[]{"Онгоинги"}, - new String[]{"Аниме сериалы"}, - new String[]{"Аниме фильмы"}) - .oneTimeKeyboard(true) - .resizeKeyboard(true) - .selective(true); - } - - public static Keyboard getCarousel() { - InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup(); - - inlineKeyboardMarkup.addRow(new InlineKeyboardButton("Смотреть / Скачать").callbackData("watchOrDownload")); - inlineKeyboardMarkup.addRow(new InlineKeyboardButton("Пред.").callbackData("previous"), new InlineKeyboardButton("След.").callbackData("next")); - - return inlineKeyboardMarkup; - } - - public static Keyboard getDub() { - return new InlineKeyboardMarkup(new InlineKeyboardButton("Anidub").callbackData("anidub")); - } - - public static Keyboard getAnidub() throws IOException { - Anime[] anime = Anime.list; - Anime thisAnime = anime[Anime.indexOfAnime]; - - Elements seriesList = Parser.getPage(thisAnime.getUrl()).select("div[class=tabs-b video-box]").next().select("span"); - ArrayList series = new ArrayList<>(); - ArrayList seriesUrls = new ArrayList<>(); - - for (Element seriesTemp : seriesList) { - series.add(Jsoup.parse(String.valueOf(seriesTemp)).text()); - } - - for (Element seriesTemp : seriesList) { - String text = seriesTemp.toString(); - int start = text.indexOf("=\"") + 2; - int end = text.indexOf("\" "); - char[] dst = new char[end - start]; - text.getChars(start, end, dst, 0); - seriesUrls.add(String.valueOf(dst)); - } - - InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup(); - seriesSize = (short) series.size(); - for (int i = 0; i < seriesSize; i++) { - if (i+2 < seriesSize) { - inlineKeyboardMarkup.addRow( - new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), - new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)), - new InlineKeyboardButton(series.get(i+2)).url(seriesUrls.get(i+2)) - ); - i += 2; - } else if (i+1 < seriesSize) { - inlineKeyboardMarkup.addRow( - new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), - new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)) - ); - i++; - } else { - inlineKeyboardMarkup.addRow( - new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)) - ); - } - } - - return inlineKeyboardMarkup; - } -} diff --git a/src/main/java/files/UserCallbackQuery.java b/src/main/java/files/UserCallbackQuery.java index f385542..001624e 100644 --- a/src/main/java/files/UserCallbackQuery.java +++ b/src/main/java/files/UserCallbackQuery.java @@ -50,8 +50,8 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue case "watchOrDownload" -> { Anime[] anime = Anime.list; byte index = Anime.indexOfAnime; - Keyboard anidub = MyKeyboard.getAnidub(); - if (MyKeyboard.seriesSize > 0) { + 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, "Прости, но я не смог найти серии для этого аниме... :(")); diff --git a/src/main/java/files/UserKeyboard.java b/src/main/java/files/UserKeyboard.java new file mode 100644 index 0000000..c5f2b82 --- /dev/null +++ b/src/main/java/files/UserKeyboard.java @@ -0,0 +1,87 @@ +package files; + +import com.pengrad.telegrambot.model.request.Keyboard; +import com.pengrad.telegrambot.model.request.InlineKeyboardButton; +import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup; +import com.pengrad.telegrambot.model.request.ReplyKeyboardMarkup; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; + +import java.io.IOException; +import java.util.ArrayList; + +public class UserKeyboard { + public static short seriesSize; + + public static Keyboard getMain() { + return new ReplyKeyboardMarkup( + new String[]{"Поиск аниме"}, + new String[]{"Онгоинги"}, + new String[]{"Аниме сериалы"}, + new String[]{"Аниме фильмы"}) + .oneTimeKeyboard(true) + .resizeKeyboard(true) + .selective(true); + } + + public static Keyboard getCarousel() { + InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup(); + + inlineKeyboardMarkup.addRow(new InlineKeyboardButton("Смотреть / Скачать").callbackData("watchOrDownload")); + inlineKeyboardMarkup.addRow(new InlineKeyboardButton("Пред.").callbackData("previous"), new InlineKeyboardButton("След.").callbackData("next")); + + return inlineKeyboardMarkup; + } + + public static Keyboard getDub() { + return new InlineKeyboardMarkup(new InlineKeyboardButton("Anidub").callbackData("anidub")); + } + + public static Keyboard getAnidub() throws IOException { + Anime[] anime = Anime.list; + Anime thisAnime = anime[Anime.indexOfAnime]; + + Elements seriesList = Parser.getPage(thisAnime.getUrl()).select("div[class=tabs-b video-box]").next().select("span"); + ArrayList series = new ArrayList<>(); + ArrayList seriesUrls = new ArrayList<>(); + + for (Element seriesTemp : seriesList) { + series.add(Jsoup.parse(String.valueOf(seriesTemp)).text()); + } + + for (Element seriesTemp : seriesList) { + String text = seriesTemp.toString(); + int start = text.indexOf("=\"") + 2; + int end = text.indexOf("\" "); + char[] dst = new char[end - start]; + text.getChars(start, end, dst, 0); + seriesUrls.add(String.valueOf(dst)); + } + + InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup(); + seriesSize = (short) series.size(); + for (int i = 0; i < seriesSize; i++) { + if (i+2 < seriesSize) { + inlineKeyboardMarkup.addRow( + new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), + new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)), + new InlineKeyboardButton(series.get(i+2)).url(seriesUrls.get(i+2)) + ); + i += 2; + } else if (i+1 < seriesSize) { + inlineKeyboardMarkup.addRow( + new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), + new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)) + ); + i++; + } else { + inlineKeyboardMarkup.addRow( + new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)) + ); + } + } + + return inlineKeyboardMarkup; + } +} diff --git a/src/main/java/files/UserMessage.java b/src/main/java/files/UserMessage.java index 2def331..ea3abea 100644 --- a/src/main/java/files/UserMessage.java +++ b/src/main/java/files/UserMessage.java @@ -34,10 +34,10 @@ public class UserMessage { Anime.isSearching = false; Anime.typeOfAnime = animeTypes.get(UserMessage.text); } - Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "В какой озвучке будем смотреть?").replyMarkup(MyKeyboard.getDub())); + Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "В какой озвучке будем смотреть?").replyMarkup(UserKeyboard.getDub())); } else if (UserMessage.text.equals("/start")) { Anime.isSearching = false; - Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, ("Приветики, меня звать AniMarfo!\nЯ помогу тебе найти аниме, скачать его или же смотреть прямо тут.")).replyMarkup(MyKeyboard.getMain())); + Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, ("Приветики, меня звать AniMarfo!\nЯ помогу тебе найти аниме, скачать его или же смотреть прямо тут.")).replyMarkup(UserKeyboard.getMain())); } else { if (Anime.isSearching && Anime.dub != null) { Anime.setSearchedAnime(UserMessage.text); @@ -49,7 +49,7 @@ public class UserMessage { Anime.isSearching = false; } else { Anime.isSearching = false; - Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я тебя не понимаю...\nВоспользуйся командами на твоей клавлиатуре!").replyMarkup(MyKeyboard.getMain())); + Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я тебя не понимаю...\nВоспользуйся командами на твоей клавлиатуре!").replyMarkup(UserKeyboard.getMain())); } } -- cgit v1.2.3