Skip to content

Commit 8de83bc

Browse files
ViLsonCakeViLsonCake
committed
add mute bot mode
1 parent bfb8b5f commit 8de83bc

File tree

9 files changed

+14
-3
lines changed

9 files changed

+14
-3
lines changed

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/bot/AvgeekTelegramBot.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public void onUpdateReceived(Update update) {
115115
case MODE_ALL_BUTTON_TEXT -> botMode = BotMode.ALL;
116116
case MODE_WIDE_BODY_BUTTON_TEXT -> botMode = BotMode.ONLY_WIDE_BODY_AIRCRAFT_FLIGHTS;
117117
case MODE_AN_124_BUTTON_TEXT -> botMode = BotMode.ONLY_AN_124_FLIGHTS;
118+
case MODE_MUTE_TEXT -> botMode = BotMode.MUTE;
118119
default -> {
119120
execute(botService.incorrectModeMessage(username, update.getMessage().getText(), chatId));
120121
return;

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/constant/BotMessageEngConst.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ _Scheduled_ flight (*%s*) to your airport from *%s* (*%s*), *%s*.
109109
public static final String CHOSEN_MODE_ALL_TEXT = "You will receive alerts about An-124 flights *and* wide-body aircraft flights.";
110110
public static final String CHOSEN_MODE_ONLY_AN_124_TEXT = "You will receive alerts *only* about An-124 flights.";
111111
public static final String CHOSEN_MODE_ONLY_WIDE_BODY_TEXT = "You will receive alerts *only* for wide-body aircraft.";
112+
public static final String CHOSEN_MODE_MUTE_TEXT = "You will not receive *any* notifications.";
112113
public static final String INCORRECT_MODE_TEXT = "__%s__ is an incorrect mode. Select mode from the buttons on the keyboard.";
113114
public static final String WAIT_FOR_EMAIL_TEXT = "Enter your _email_.";
114115
public static final String INVALID_EMAIL_TEXT = "The _email_ you entered is *invalid*.";

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/constant/BotMessageRuConst.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public class BotMessageRuConst {
108108
public static final String CHOSEN_MODE_ALL_TEXT = "Вы будете получать оповещения о полетах Ан-124, *а также* о полетах широкофюзеляжных самолетов в ваш аэропорт.";
109109
public static final String CHOSEN_MODE_ONLY_AN_124_TEXT = "Вы будете получать оповещения *только* о полетах Ан-124.";
110110
public static final String CHOSEN_MODE_ONLY_WIDE_BODY_TEXT = "Вы будете получать оповещения *только* о полетах широкофюзеляжных самолетов в ваш аэропорт.";
111+
public static final String CHOSEN_MODE_MUTE_TEXT = "Вы не будете получать *никаких* уведомлений.";
111112
public static final String INCORRECT_MODE_TEXT = "__%s__ это некорректный _режим_. Пожалуйста выберите из вариантов на клавиатуре.";
112113
public static final String WAIT_FOR_EMAIL_TEXT = "*Введите* адрес _email_";
113114
public static final String INVALID_EMAIL_TEXT = "_Email_ который вы ввели *некорректен*.";

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/constant/BotMessageUkConst.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,10 @@ public class BotMessageUkConst {
105105
[Дивіться тут](https://www.flightradar24.com/%s/%s)
106106
""";
107107
public static final String CHOOSING_MODE_TEXT = "Виберіть _режим_";
108-
public static final String CHOSEN_MODE_ALL_TEXT = "Ви будете отримувати сповіщення про польоти Ан-124 _а також_ про польоти широкофюзеляжних літаках летящих у ваш аеропорт.";
108+
public static final String CHOSEN_MODE_ALL_TEXT = "Ви будете отримувати сповіщення про польоти Ан-124 *а також* про польоти широкофюзеляжних літаках летящих у ваш аеропорт.";
109109
public static final String CHOSEN_MODE_ONLY_AN_124_TEXT = "Ви будете отримувати сповіщення *тільки* про польоти Ан-124.";
110110
public static final String CHOSEN_MODE_ONLY_WIDE_BODY_TEXT = "Ви будете отримувати сповіщення *тільки* про польоти широкофюзеляжних літаків у ваш аеропорт.";
111+
public static final String CHOSEN_MODE_MUTE_TEXT = "Ви не будете отримувати *ніяких* сповіщень.";
111112
public static final String INCORRECT_MODE_TEXT = "__%s__ це некоректний режим. Будь ласка виберіть з варіантів на клавіатурі.";
112113
public static final String WAIT_FOR_EMAIL_TEXT = "Введіть адресу _email_";
113114
public static final String INVALID_EMAIL_TEXT = "_Email_ який ви ввели *некоректний*.";

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/constant/CommandConst.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public class CommandConst {
2828
public static final String MODE_ALL_BUTTON_TEXT = "All";
2929
public static final String MODE_WIDE_BODY_BUTTON_TEXT = "Wide-body";
3030
public static final String MODE_AN_124_BUTTON_TEXT = "An-124";
31+
public static final String MODE_MUTE_TEXT = "Mute";
3132
public static final String MARKDOWN_PARSE_MODE = "Markdown";
32-
public static final List<String> MODES = List.of(MODE_ALL_BUTTON_TEXT, MODE_WIDE_BODY_BUTTON_TEXT, MODE_AN_124_BUTTON_TEXT);
33+
public static final List<String> MODES = List.of(MODE_ALL_BUTTON_TEXT, MODE_WIDE_BODY_BUTTON_TEXT, MODE_AN_124_BUTTON_TEXT, MODE_MUTE_TEXT);
3334
public static final List<String> LANGUAGES = List.of(ENG.name().toLowerCase(), RU.name().toLowerCase(), UK.name().toLowerCase());
3435
}

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/entity/enumerated/BotMessageTemplate.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public enum BotMessageTemplate {
2121
CHOSEN_MODE_ALL_TEXT,
2222
CHOSEN_MODE_ONLY_AN_124_TEXT,
2323
CHOSEN_MODE_ONLY_WIDE_BODY_TEXT,
24+
CHOSEN_MODE_MUTE_TEXT,
2425
INCORRECT_MODE_TEXT,
2526
WAIT_FOR_EMAIL_TEXT,
2627
INVALID_EMAIL_TEXT,

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/entity/enumerated/BotMode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package project.vilsoncake.telegrambot.entity.enumerated;
22

33
public enum BotMode {
4-
ALL, ONLY_AN_124_FLIGHTS, ONLY_WIDE_BODY_AIRCRAFT_FLIGHTS
4+
ALL, ONLY_AN_124_FLIGHTS, ONLY_WIDE_BODY_AIRCRAFT_FLIGHTS, MUTE
55
}

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/service/impl/BotServiceImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ public SendMessage changeBotMode(String username, BotMode botMode, Long chatId)
282282
case ALL -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_ALL_TEXT, user.getBotLanguage()));
283283
case ONLY_AN_124_FLIGHTS -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_ONLY_AN_124_TEXT, user.getBotLanguage()));
284284
case ONLY_WIDE_BODY_AIRCRAFT_FLIGHTS -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_ONLY_WIDE_BODY_TEXT, user.getBotLanguage()));
285+
case MUTE -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_MUTE_TEXT, user.getBotLanguage()));
285286
}
286287

287288
return message;
@@ -299,6 +300,7 @@ public SendMessage getBotMode(String username, Long chatId) {
299300
case ALL -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_ALL_TEXT, user.getBotLanguage()));
300301
case ONLY_WIDE_BODY_AIRCRAFT_FLIGHTS -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_ONLY_WIDE_BODY_TEXT, user.getBotLanguage()));
301302
case ONLY_AN_124_FLIGHTS -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_ONLY_AN_124_TEXT, user.getBotLanguage()));
303+
case MUTE -> message.setText(botMessageUtils.getMessageByLanguage(CHOSEN_MODE_MUTE_TEXT, user.getBotLanguage()));
302304
}
303305

304306
return message;

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/utils/BotMessageUtils.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ private String getEngConstant(BotMessageTemplate template) {
4040
case CHOSEN_MODE_ALL_TEXT -> BotMessageEngConst.CHOSEN_MODE_ALL_TEXT;
4141
case CHOSEN_MODE_ONLY_AN_124_TEXT -> BotMessageEngConst.CHOSEN_MODE_ONLY_AN_124_TEXT;
4242
case CHOSEN_MODE_ONLY_WIDE_BODY_TEXT -> BotMessageEngConst.CHOSEN_MODE_ONLY_WIDE_BODY_TEXT;
43+
case CHOSEN_MODE_MUTE_TEXT -> BotMessageEngConst.CHOSEN_MODE_MUTE_TEXT;
4344
case INCORRECT_MODE_TEXT -> BotMessageEngConst.INCORRECT_MODE_TEXT;
4445
case WAIT_FOR_EMAIL_TEXT -> BotMessageEngConst.WAIT_FOR_EMAIL_TEXT;
4546
case INVALID_EMAIL_TEXT -> BotMessageEngConst.INVALID_EMAIL_TEXT;
@@ -80,6 +81,7 @@ private String getRuConstant(BotMessageTemplate template) {
8081
case CHOSEN_MODE_ALL_TEXT -> BotMessageRuConst.CHOSEN_MODE_ALL_TEXT;
8182
case CHOSEN_MODE_ONLY_AN_124_TEXT -> BotMessageRuConst.CHOSEN_MODE_ONLY_AN_124_TEXT;
8283
case CHOSEN_MODE_ONLY_WIDE_BODY_TEXT -> BotMessageRuConst.CHOSEN_MODE_ONLY_WIDE_BODY_TEXT;
84+
case CHOSEN_MODE_MUTE_TEXT -> BotMessageRuConst.CHOSEN_MODE_MUTE_TEXT;
8385
case INCORRECT_MODE_TEXT -> BotMessageRuConst.INCORRECT_MODE_TEXT;
8486
case WAIT_FOR_EMAIL_TEXT -> BotMessageRuConst.WAIT_FOR_EMAIL_TEXT;
8587
case INVALID_EMAIL_TEXT -> BotMessageRuConst.INVALID_EMAIL_TEXT;
@@ -120,6 +122,7 @@ private String getUaConstant(BotMessageTemplate template) {
120122
case CHOSEN_MODE_ALL_TEXT -> BotMessageUkConst.CHOSEN_MODE_ALL_TEXT;
121123
case CHOSEN_MODE_ONLY_AN_124_TEXT -> BotMessageUkConst.CHOSEN_MODE_ONLY_AN_124_TEXT;
122124
case CHOSEN_MODE_ONLY_WIDE_BODY_TEXT -> BotMessageUkConst.CHOSEN_MODE_ONLY_WIDE_BODY_TEXT;
125+
case CHOSEN_MODE_MUTE_TEXT -> BotMessageUkConst.CHOSEN_MODE_MUTE_TEXT;
123126
case INCORRECT_MODE_TEXT -> BotMessageUkConst.INCORRECT_MODE_TEXT;
124127
case WAIT_FOR_EMAIL_TEXT -> BotMessageUkConst.WAIT_FOR_EMAIL_TEXT;
125128
case INVALID_EMAIL_TEXT -> BotMessageUkConst.INVALID_EMAIL_TEXT;

0 commit comments

Comments
 (0)