Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f136aefe31 |
4
pom.xml
4
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1.1</version>
|
||||||
<name>stbf-parent</name>
|
<name>stbf-parent</name>
|
||||||
|
|
||||||
<description>Simple Telegram Bot Facade</description>
|
<description>Simple Telegram Bot Facade</description>
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</connection>
|
<connection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</connection>
|
||||||
<developerConnection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</developerConnection>
|
<developerConnection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</developerConnection>
|
||||||
<tag>HEAD</tag>
|
<tag>stbf-parent-0.0.1</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>stbf-api</artifactId>
|
<artifactId>stbf-api</artifactId>
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public interface BotRequest {
|
|||||||
|
|
||||||
Long getChatId();
|
Long getChatId();
|
||||||
|
|
||||||
BotSession getSession();
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
package ru.penkrat.stbf.api;
|
|
||||||
|
|
||||||
public interface BotSession {
|
|
||||||
|
|
||||||
Object getAttribute(String name);
|
|
||||||
|
|
||||||
void setAttribute(String name, Object value);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package ru.penkrat.stbf.api;
|
|
||||||
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface SessionProvider {
|
|
||||||
|
|
||||||
BotSession get(Long chatId);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>stbf-common</artifactId>
|
<artifactId>stbf-common</artifactId>
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-api</artifactId>
|
<artifactId>stbf-api</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
package ru.penkrat.stbf.common.command;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import ru.penkrat.stbf.api.BotRequest;
|
|
||||||
import ru.penkrat.stbf.api.BotResponse;
|
|
||||||
import ru.penkrat.stbf.api.CommandChain;
|
|
||||||
import ru.penkrat.stbf.api.SessionProvider;
|
|
||||||
import ru.penkrat.stbf.common.session.SessionAwareBotRequest;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class SessionAwareCommandChain implements CommandChain {
|
|
||||||
|
|
||||||
private final CommandChain delegate;
|
|
||||||
private final SessionProvider sessionProvider;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void processCommand(BotRequest botRequest, BotResponse botResponse) {
|
|
||||||
delegate.processCommand(new SessionAwareBotRequest(botRequest, sessionProvider), botResponse);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package ru.penkrat.stbf.common.command;
|
|
||||||
|
|
||||||
import ru.penkrat.stbf.api.BotRequest;
|
|
||||||
import ru.penkrat.stbf.api.BotResponse;
|
|
||||||
import ru.penkrat.stbf.api.CommandChain;
|
|
||||||
|
|
||||||
import java.util.concurrent.ExecutorService;
|
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
|
|
||||||
public class ThreadPolledCommandChain implements CommandChain {
|
|
||||||
|
|
||||||
private final CommandChain delegate;
|
|
||||||
private final ExecutorService executor;
|
|
||||||
|
|
||||||
public ThreadPolledCommandChain(CommandChain delegate) {
|
|
||||||
this(delegate, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ThreadPolledCommandChain(CommandChain delegate, int nThreads) {
|
|
||||||
this.delegate = delegate;
|
|
||||||
this.executor = Executors.newFixedThreadPool(nThreads);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void processCommand(BotRequest botRequest, BotResponse botResponse) {
|
|
||||||
executor.execute(() -> {
|
|
||||||
delegate.processCommand(botRequest, botResponse);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package ru.penkrat.stbf.common.session;
|
|
||||||
|
|
||||||
import ru.penkrat.stbf.api.BotSession;
|
|
||||||
import ru.penkrat.stbf.api.SessionProvider;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
|
|
||||||
public class InMemBotSessionProvider implements SessionProvider {
|
|
||||||
|
|
||||||
private static final Map<Long, BotSession> MAP = new ConcurrentHashMap<>();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BotSession get(Long chatId) {
|
|
||||||
return MAP.computeIfAbsent(chatId, k -> new MapBackedBotSession(new ConcurrentHashMap<>()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package ru.penkrat.stbf.common.session;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import ru.penkrat.stbf.api.BotSession;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
class MapBackedBotSession implements BotSession {
|
|
||||||
|
|
||||||
private final Map<String, Object> map;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getAttribute(String name) {
|
|
||||||
return map.get(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setAttribute(String name, Object value) {
|
|
||||||
map.put(name, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
package ru.penkrat.stbf.common.session;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import ru.penkrat.stbf.api.BotRequest;
|
|
||||||
import ru.penkrat.stbf.api.BotSession;
|
|
||||||
import ru.penkrat.stbf.api.SessionProvider;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class SessionAwareBotRequest implements BotRequest {
|
|
||||||
|
|
||||||
private final BotRequest delegate;
|
|
||||||
|
|
||||||
private final SessionProvider sessionProvider;
|
|
||||||
|
|
||||||
private BotSession botSession;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BotSession getSession() {
|
|
||||||
if (botSession == null) {
|
|
||||||
botSession = sessionProvider.get(getChatId());
|
|
||||||
Objects.requireNonNull(botSession, "Session can not be null");
|
|
||||||
}
|
|
||||||
return botSession;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<String> getMessageText() {
|
|
||||||
return this.delegate.getMessageText();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<String> getPhoneNumber() {
|
|
||||||
return this.delegate.getPhoneNumber();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<String> getCallbackData() {
|
|
||||||
return this.delegate.getCallbackData();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<String> getCallbackMessageText() {
|
|
||||||
return this.delegate.getCallbackMessageText();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getChatId() {
|
|
||||||
return this.delegate.getChatId();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
@@ -34,11 +34,6 @@
|
|||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<artifactId>stbf-common</artifactId>
|
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>info.picocli</groupId>
|
<groupId>info.picocli</groupId>
|
||||||
<artifactId>picocli</artifactId>
|
<artifactId>picocli</artifactId>
|
||||||
|
|||||||
@@ -5,67 +5,64 @@ import org.slf4j.LoggerFactory;
|
|||||||
import picocli.CommandLine;
|
import picocli.CommandLine;
|
||||||
import ru.penkrat.stbf.api.BotCommandChain;
|
import ru.penkrat.stbf.api.BotCommandChain;
|
||||||
import ru.penkrat.stbf.api.CommandChain;
|
import ru.penkrat.stbf.api.CommandChain;
|
||||||
import ru.penkrat.stbf.common.command.SessionAwareCommandChain;
|
|
||||||
import ru.penkrat.stbf.common.command.ThreadPolledCommandChain;
|
|
||||||
import ru.penkrat.stbf.common.session.InMemBotSessionProvider;
|
|
||||||
import ru.penkrat.stbf.impl.pengrad.PengradTelegramBot;
|
import ru.penkrat.stbf.impl.pengrad.PengradTelegramBot;
|
||||||
import ru.penkrat.stbf.templates.xml.XmlFlowResolver;
|
import ru.penkrat.stbf.templates.xml.XmlFlowResolver;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
@CommandLine.Command(name = "java -jar stbf-demo.jar", mixinStandardHelpOptions = true, description = "Run bot",
|
@CommandLine.Command(name = "java -jar stbf-demo.jar", mixinStandardHelpOptions = true, description = "Run bot",
|
||||||
version = "Simple Telegram bot framework Demo app v. 0.0.2")
|
version = "Simple Telegram bot framework Demo app v. 0.0.1")
|
||||||
public class App implements Runnable {
|
public class App implements Runnable {
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(App.class);
|
private static final Logger log = LoggerFactory.getLogger(App.class);
|
||||||
|
|
||||||
private static AtomicReference<PengradTelegramBot> botAtomicReference = new AtomicReference<>();
|
private static AtomicReference<PengradTelegramBot> botAtomicReference = new AtomicReference<>();
|
||||||
|
|
||||||
@CommandLine.Option(names = {"-f", "--file"}, description = "The file with config.")
|
@CommandLine.Option(names = {"-f", "--file"}, description = "The file with config.")
|
||||||
private String flowFile = "classpath:/flow.xml";
|
private String flowFile = "classpath:/flow.xml";
|
||||||
|
|
||||||
@CommandLine.Option(names = {"-t", "--token"}, required = true, description = "bot token 1234:abscdf...")
|
@CommandLine.Option(names = {"-t", "--token"}, required = true, description = "bot token 1234:abscdf...")
|
||||||
private String botToken = "";
|
private String botToken = "";
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
new CommandLine(new App()).execute(args);
|
new CommandLine(new App()).execute(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
private CommandChain getCommandChain(String filename) {
|
private BotCommandChain getCommandChain(String filename) {
|
||||||
XmlFlowResolver flow = new XmlFlowResolver(filename);
|
XmlFlowResolver flow = new XmlFlowResolver(filename);
|
||||||
|
|
||||||
BotCommandChain chain = new BotCommandChain();
|
BotCommandChain chain = new BotCommandChain();
|
||||||
flow.getCommands().forEach(chain::add);
|
flow.getCommands().forEach(chain::add);
|
||||||
|
|
||||||
return new ThreadPolledCommandChain(new SessionAwareCommandChain(chain, new InMemBotSessionProvider()));
|
return chain;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Runnable start(String token, CommandChain chain) {
|
private Runnable start(String token, CommandChain chain) {
|
||||||
return () -> botAtomicReference.set(new PengradTelegramBot(token, chain));
|
return () -> botAtomicReference.set(new PengradTelegramBot(token, chain));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onShutdown() {
|
private void onShutdown() {
|
||||||
try {
|
try {
|
||||||
if (botAtomicReference.get() != null) {
|
if (botAtomicReference.get() != null) {
|
||||||
botAtomicReference.get().close();
|
botAtomicReference.get().close();
|
||||||
log.info("Bot finished.");
|
log.info("Bot finished.");
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error:", e);
|
log.error("Error:", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
Thread botThread = new Thread(start(botToken, getCommandChain(flowFile)));
|
Thread botThread = new Thread(start(botToken, getCommandChain(flowFile)));
|
||||||
botThread.setDaemon(false);
|
botThread.setDaemon(false);
|
||||||
botThread.setName("stbf-bot-thread");
|
botThread.setName("stbf-bot-thread");
|
||||||
|
|
||||||
Runtime.getRuntime().addShutdownHook(new Thread(this::onShutdown));
|
Runtime.getRuntime().addShutdownHook(new Thread(this::onShutdown));
|
||||||
|
|
||||||
log.info("Starting bot...");
|
log.info("Starting bot...");
|
||||||
botThread.start();
|
botThread.start();
|
||||||
log.info("Bot started.");
|
log.info("Bot started.");
|
||||||
log.info("Press Ctrl+C to exit.");
|
log.info("Press Ctrl+C to exit.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>stbf-pengrad</artifactId>
|
<artifactId>stbf-pengrad</artifactId>
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-api</artifactId>
|
<artifactId>stbf-api</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.pengrad</groupId>
|
<groupId>com.github.pengrad</groupId>
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
package ru.penkrat.stbf.impl.pengrad;
|
package ru.penkrat.stbf.impl.pengrad;
|
||||||
|
|
||||||
import com.pengrad.telegrambot.model.CallbackQuery;
|
import com.pengrad.telegrambot.model.CallbackQuery;
|
||||||
|
import com.pengrad.telegrambot.model.Chat;
|
||||||
import com.pengrad.telegrambot.model.Contact;
|
import com.pengrad.telegrambot.model.Contact;
|
||||||
import com.pengrad.telegrambot.model.Message;
|
import com.pengrad.telegrambot.model.Message;
|
||||||
import com.pengrad.telegrambot.model.Update;
|
import com.pengrad.telegrambot.model.Update;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import ru.penkrat.stbf.api.BotRequest;
|
import ru.penkrat.stbf.api.BotRequest;
|
||||||
import ru.penkrat.stbf.api.BotSession;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@@ -52,15 +52,25 @@ public class BotRequestImpl implements BotRequest {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Long getChatId() {
|
public Long getChatId() {
|
||||||
return Optional.of(update)
|
return Optional.ofNullable(getMessage())
|
||||||
.map(Update::callbackQuery)
|
.map(Message::chat)
|
||||||
.map(CallbackQuery::message)
|
.map(Chat::id)
|
||||||
.orElseGet(() -> update.message()).chat().id();
|
.orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
private Message getMessage() {
|
||||||
public BotSession getSession() {
|
if (update != null) {
|
||||||
throw new UnsupportedOperationException("Session is not supported");
|
if (update.callbackQuery() != null) {
|
||||||
|
return update.callbackQuery().message();
|
||||||
|
}
|
||||||
|
if (update.message() != null) {
|
||||||
|
return update.message();
|
||||||
|
}
|
||||||
|
if (update.editedMessage() != null) {
|
||||||
|
return update.editedMessage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import com.pengrad.telegrambot.request.AbstractSendRequest;
|
|||||||
import com.pengrad.telegrambot.request.DeleteMessage;
|
import com.pengrad.telegrambot.request.DeleteMessage;
|
||||||
import com.pengrad.telegrambot.request.EditMessageText;
|
import com.pengrad.telegrambot.request.EditMessageText;
|
||||||
import com.pengrad.telegrambot.request.SendDocument;
|
import com.pengrad.telegrambot.request.SendDocument;
|
||||||
import com.pengrad.telegrambot.response.BaseResponse;
|
|
||||||
import com.pengrad.telegrambot.response.SendResponse;
|
import com.pengrad.telegrambot.response.SendResponse;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -28,7 +27,7 @@ public class BotResponseImpl implements BotResponse {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void send(Screen screen) {
|
public void send(Screen screen) {
|
||||||
log.trace("Send trace: \n============\n{}\n============", screen.getText().trim());
|
log.debug("Send message: \n============\n{}\n============", screen.getText().trim());
|
||||||
|
|
||||||
AbstractSendRequest<? extends AbstractSendRequest> sendMessage = SendMethodUtils.createFromScreen(chatId(), screen);
|
AbstractSendRequest<? extends AbstractSendRequest> sendMessage = SendMethodUtils.createFromScreen(chatId(), screen);
|
||||||
|
|
||||||
@@ -37,8 +36,8 @@ public class BotResponseImpl implements BotResponse {
|
|||||||
KeyboardButton[][] keyboard = kk.getKeyboard();
|
KeyboardButton[][] keyboard = kk.getKeyboard();
|
||||||
InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
|
InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
|
||||||
|
|
||||||
if (log.isTraceEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.trace("{}", kk.toFriendlyString());
|
log.debug("{}", kk.toFriendlyString());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inlineKeyboard != null && inlineKeyboard.length > 0) {
|
if (inlineKeyboard != null && inlineKeyboard.length > 0) {
|
||||||
@@ -46,14 +45,12 @@ public class BotResponseImpl implements BotResponse {
|
|||||||
} else if (keyboard != null && keyboard.length > 0) {
|
} else if (keyboard != null && keyboard.length > 0) {
|
||||||
sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard));
|
sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard));
|
||||||
} else {
|
} else {
|
||||||
log.trace("No keyboard");
|
log.debug("No keyboard");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final SendResponse sendResponse = telegramBot.execute(sendMessage);
|
final SendResponse sendResponse = telegramBot.execute(sendMessage);
|
||||||
SendMethodUtils.processResponse(screen, sendResponse);
|
SendMethodUtils.processResponse(screen, sendResponse);
|
||||||
|
|
||||||
log.debug("Response message = {}", sendResponse.message().messageId());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -79,23 +76,18 @@ public class BotResponseImpl implements BotResponse {
|
|||||||
KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
|
KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
|
||||||
InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
|
InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
|
||||||
|
|
||||||
if (log.isTraceEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.trace("{}", kk.toFriendlyString());
|
log.debug("{}", kk.toFriendlyString());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inlineKeyboard != null && inlineKeyboard.length > 0) {
|
if (inlineKeyboard != null && inlineKeyboard.length > 0) {
|
||||||
editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard));
|
editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard));
|
||||||
} else {
|
} else {
|
||||||
log.trace("No keyboard");
|
log.debug("No keyboard");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final BaseResponse response = telegramBot.execute(editMessage);
|
telegramBot.execute(editMessage);
|
||||||
if (response.isOk()) {
|
|
||||||
log.debug("Response ok, edit message = {}", messageId());
|
|
||||||
} else {
|
|
||||||
log.debug("Response error code {}", response.errorCode());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package ru.penkrat.stbf.impl.pengrad;
|
package ru.penkrat.stbf.impl.pengrad;
|
||||||
|
|
||||||
import com.google.gson.internal.reflect.ReflectionHelper;
|
import com.google.gson.internal.reflect.ReflectionAccessor;
|
||||||
import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
|
import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
|
||||||
import com.pengrad.telegrambot.model.request.KeyboardButton;
|
import com.pengrad.telegrambot.model.request.KeyboardButton;
|
||||||
import lombok.Value;
|
import lombok.Value;
|
||||||
@@ -58,7 +58,7 @@ class KeyboardImpl implements Keyboard {
|
|||||||
return text.computeIfAbsent(btn, o -> {
|
return text.computeIfAbsent(btn, o -> {
|
||||||
try {
|
try {
|
||||||
Field text = btn.getClass().getDeclaredField("text");
|
Field text = btn.getClass().getDeclaredField("text");
|
||||||
ReflectionHelper.makeAccessible(text);
|
ReflectionAccessor.getInstance().makeAccessible(text);
|
||||||
return String.valueOf(text.get(btn));
|
return String.valueOf(text.get(btn));
|
||||||
} catch (NoSuchFieldException | IllegalAccessException e) {
|
} catch (NoSuchFieldException | IllegalAccessException e) {
|
||||||
return "*error*";
|
return "*error*";
|
||||||
|
|||||||
@@ -2,13 +2,11 @@ package ru.penkrat.stbf.impl.pengrad;
|
|||||||
|
|
||||||
import com.pengrad.telegrambot.TelegramBot;
|
import com.pengrad.telegrambot.TelegramBot;
|
||||||
import com.pengrad.telegrambot.UpdatesListener;
|
import com.pengrad.telegrambot.UpdatesListener;
|
||||||
import com.pengrad.telegrambot.model.CallbackQuery;
|
|
||||||
import com.pengrad.telegrambot.model.Update;
|
import com.pengrad.telegrambot.model.Update;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import ru.penkrat.stbf.api.CommandChain;
|
import ru.penkrat.stbf.api.CommandChain;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
|
public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
|
||||||
|
|
||||||
@@ -17,13 +15,6 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
|
|||||||
this.setUpdatesListener(updates -> {
|
this.setUpdatesListener(updates -> {
|
||||||
for (Update update : updates) {
|
for (Update update : updates) {
|
||||||
try {
|
try {
|
||||||
final Long chatId = Optional.of(update)
|
|
||||||
.map(Update::callbackQuery)
|
|
||||||
.map(CallbackQuery::message)
|
|
||||||
.orElseGet(() -> update.message()).chat().id();
|
|
||||||
|
|
||||||
log.debug("New message in chat {}", chatId);
|
|
||||||
|
|
||||||
commandChain.processCommand(
|
commandChain.processCommand(
|
||||||
new BotRequestImpl(update),
|
new BotRequestImpl(update),
|
||||||
new BotResponseImpl(update, this));
|
new BotResponseImpl(update, this));
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>stbf-rubenlagus</artifactId>
|
<artifactId>stbf-rubenlagus</artifactId>
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-api</artifactId>
|
<artifactId>stbf-api</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.telegram</groupId>
|
<groupId>org.telegram</groupId>
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
package ru.penkrat.stbf.impl.rubenlagus;
|
package ru.penkrat.stbf.impl.rubenlagus;
|
||||||
|
|
||||||
import lombok.Getter;
|
import static lombok.AccessLevel.PROTECTED;
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
|
import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
|
||||||
import org.telegram.telegrambots.meta.api.objects.Contact;
|
import org.telegram.telegrambots.meta.api.objects.Contact;
|
||||||
import org.telegram.telegrambots.meta.api.objects.Message;
|
import org.telegram.telegrambots.meta.api.objects.Message;
|
||||||
import org.telegram.telegrambots.meta.api.objects.Update;
|
import org.telegram.telegrambots.meta.api.objects.Update;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
import ru.penkrat.stbf.api.BotRequest;
|
import ru.penkrat.stbf.api.BotRequest;
|
||||||
import ru.penkrat.stbf.api.BotSession;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import static lombok.AccessLevel.PROTECTED;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
class BotRequestImpl implements BotRequest {
|
class BotRequestImpl implements BotRequest {
|
||||||
@@ -52,12 +52,7 @@ class BotRequestImpl implements BotRequest {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Long getChatId() {
|
public Long getChatId() {
|
||||||
return Utils.getChatId(update);
|
return update.getMessage().getChatId();
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BotSession getSession() {
|
|
||||||
throw new UnsupportedOperationException("Session is not supported");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
package ru.penkrat.stbf.impl.rubenlagus;
|
package ru.penkrat.stbf.impl.rubenlagus;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.telegram.telegrambots.bots.TelegramLongPollingBot;
|
import org.telegram.telegrambots.bots.TelegramLongPollingBot;
|
||||||
import org.telegram.telegrambots.meta.TelegramBotsApi;
|
import org.telegram.telegrambots.meta.TelegramBotsApi;
|
||||||
import org.telegram.telegrambots.meta.api.objects.Update;
|
import org.telegram.telegrambots.meta.api.objects.Update;
|
||||||
import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
|
import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
|
||||||
import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
|
import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import ru.penkrat.stbf.api.BotCommandChain;
|
import ru.penkrat.stbf.api.BotCommandChain;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
package ru.penkrat.stbf.impl.rubenlagus;
|
|
||||||
|
|
||||||
import lombok.experimental.UtilityClass;
|
|
||||||
import org.telegram.telegrambots.meta.api.objects.Update;
|
|
||||||
|
|
||||||
@UtilityClass
|
|
||||||
class Utils {
|
|
||||||
|
|
||||||
Long getChatId(Update update) {
|
|
||||||
if (update.getMessage() != null) {
|
|
||||||
return update.getMessage().getChatId();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (update.getCallbackQuery() != null) {
|
|
||||||
update.getCallbackQuery().getMessage().getChatId();
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new IllegalStateException("Can't extract chatId from 'Update'");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>stbf-templates</artifactId>
|
<artifactId>stbf-templates</artifactId>
|
||||||
<properties>
|
<properties>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>stbf-parent</artifactId>
|
<artifactId>stbf-parent</artifactId>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>stbf-test</artifactId>
|
<artifactId>stbf-test</artifactId>
|
||||||
@@ -14,12 +14,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-api</artifactId>
|
<artifactId>stbf-api</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ru.penkrat.stbf</groupId>
|
<groupId>ru.penkrat.stbf</groupId>
|
||||||
<artifactId>stbf-common</artifactId>
|
<artifactId>stbf-common</artifactId>
|
||||||
<version>0.0.2-SNAPSHOT</version>
|
<version>0.0.1</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import java.util.Random;
|
|||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import ru.penkrat.stbf.api.BotRequest;
|
import ru.penkrat.stbf.api.BotRequest;
|
||||||
import ru.penkrat.stbf.api.BotSession;
|
|
||||||
|
|
||||||
@Builder
|
@Builder
|
||||||
class BotRequestImpl implements BotRequest {
|
class BotRequestImpl implements BotRequest {
|
||||||
@@ -15,7 +14,6 @@ class BotRequestImpl implements BotRequest {
|
|||||||
private String phoneNumber;
|
private String phoneNumber;
|
||||||
private String callbackData;
|
private String callbackData;
|
||||||
private String callbackMessageText;
|
private String callbackMessageText;
|
||||||
private BotSession session;
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Builder.Default
|
@Builder.Default
|
||||||
@@ -41,9 +39,4 @@ class BotRequestImpl implements BotRequest {
|
|||||||
return Optional.ofNullable(callbackMessageText);
|
return Optional.ofNullable(callbackMessageText);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public BotSession getSession() {
|
|
||||||
return session;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user