Skip to content

Commit 96ed533

Browse files
Начал писать тестовый клиент
Добавил конфиг и начал создание базцы БМ
1 parent 58e987d commit 96ed533

File tree

5 files changed

+82
-13
lines changed

5 files changed

+82
-13
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package ru.untitled_devs.bot;
2+
3+
public class Config {
4+
private String botToken;
5+
private String botName;
6+
7+
public Config() {
8+
loadVariables();
9+
}
10+
11+
private void loadVariables() {
12+
this.botToken = System.getenv("BOT_TOKEN");
13+
this.botName = System.getenv("BOT_NAME");
14+
}
15+
16+
public String getBotToken() {
17+
return this.botToken;
18+
}
19+
20+
public String getBotName() {
21+
return this.botName;
22+
}
23+
}
Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
11
package ru.untitled_devs.bot;
22

33

4+
import org.apache.logging.log4j.LogManager;
5+
import org.apache.logging.log4j.Logger;
6+
import org.telegram.telegrambots.meta.TelegramBotsApi;
7+
import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
8+
import ru.untitled_devs.core.client.Bot;
9+
import ru.untitled_devs.core.fsm.storage.InMemoryStorage;
10+
411
public class Main {
5-
public static void main(String[] args) {
12+
static Config config = new Config();
13+
static InMemoryStorage storage = new InMemoryStorage();
14+
protected static final Logger logger = LogManager.getLogger();
615

16+
17+
public static void main(String[] args) {
18+
try {
19+
TelegramBotsApi botsApi = new TelegramBotsApi(DefaultBotSession.class);
20+
Bot bot = new Bot(config.getBotToken(), config.getBotName(), storage,logger);
21+
botsApi.registerBot(bot);
22+
} catch (Exception e) {
23+
logger.error(e.getMessage());
24+
}
725
}
826
}

src/main/java/ru/untitled_devs/core/client/Bot.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ public String getBotUsername() {
4848
return this.botUsername;
4949
}
5050

51+
@Override
5152
public void addRouter(Router router) {
5253
this.routers.add(router);
5354
}
5455

56+
@Override
5557
public void addMiddleware(Middleware middleware) {
5658
this.middlewares.add(middleware);
5759
}
@@ -166,7 +168,7 @@ public void banChatMember(long chatId, long userId, int duration) {
166168
try {
167169
execute(banChatMember);
168170
} catch (TelegramApiException e) {
169-
this.logger.error(e.getMessage());
171+
System.err.println(e.getMessage());
170172
}
171173

172174
}

src/main/java/ru/untitled_devs/core/client/BotClient.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import org.telegram.telegrambots.meta.api.objects.Update;
44
import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
5+
import ru.untitled_devs.core.middlewares.Middleware;
6+
import ru.untitled_devs.core.routers.Router;
57

68
public interface BotClient {
79
void sendMessage(long chatId, String text);
@@ -11,5 +13,7 @@ public interface BotClient {
1113
void deleteMessage(long chatId, int messageId);
1214
void sendPhoto(long chatId, String caption, byte[] photo);
1315
void answerCallbackQuery(String callbackQueryId, String text, boolean showAlert);
14-
void onUpdateReceived(Update update);
15-
}
16+
17+
void addMiddleware(Middleware middleware);
18+
void addRouter(Router router);
19+
}
Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,69 @@
11
package ru.untitled_devs.core.client;
22

3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
5+
import org.telegram.telegrambots.meta.api.objects.Message;
36
import org.telegram.telegrambots.meta.api.objects.Update;
47
import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
8+
import ru.untitled_devs.core.middlewares.Middleware;
9+
import ru.untitled_devs.core.routers.Router;
10+
11+
import java.util.ArrayList;
12+
import java.util.List;
513

614
public class TestClient implements BotClient {
15+
private final List<Router> routers = new ArrayList<>();
16+
private final List<Middleware> middlewares = new ArrayList<>();
17+
18+
protected static final Logger logger = LogManager.getLogger();
719

820
@Override
9-
public void sendMessage(long chatId, String text) {
21+
public void addMiddleware(Middleware middleware) {
22+
this.middlewares.add(middleware);
23+
}
1024

25+
@Override
26+
public void addRouter(Router router) {
27+
this.routers.add(router);
1128
}
1229

1330
@Override
14-
public void banChatMember(long chatId, long userId, int duration) {
31+
public void sendMessage(long chatId, String text) {
32+
logger.info("Sent message in chat {} with text '{}'", chatId, text);
33+
}
1534

35+
@Override
36+
public void banChatMember(long chatId, long userId, int duration) {
37+
logger.info("Banned user {} in chat {} for {} seconds", userId, chatId, duration);
1638
}
1739

1840
@Override
1941
public void editMessageText(long chatId, int messageId, String newText) {
20-
42+
logger.info("Edited message {} in chat {} with new text '{}'", messageId, chatId, newText);
2143
}
2244

2345
@Override
2446
public void editMessageReplyMarkup(long chatId, int messageId, InlineKeyboardMarkup replyKeyboard) {
25-
47+
logger.info("Edited reply markup of message {} in chat {}", messageId, chatId);
2648
}
2749

2850
@Override
2951
public void deleteMessage(long chatId, int messageId) {
30-
52+
logger.info("Deleted message {} in chat {}", messageId, chatId);
3153
}
3254

3355
@Override
3456
public void sendPhoto(long chatId, String caption, byte[] photo) {
35-
57+
logger.info("Sent photo in chat {} with caption '{}'", chatId, caption);
3658
}
3759

3860
@Override
3961
public void answerCallbackQuery(String callbackQueryId, String text, boolean showAlert) {
40-
62+
logger.info("Answered callback query {} with text '{}' and showAlert={}", callbackQueryId, text, showAlert);
4163
}
4264

43-
@Override
44-
public void onUpdateReceived(Update update) {
65+
void simulateUserMessage(Message message) {
4566

4667
}
68+
4769
}

0 commit comments

Comments
 (0)