1 Commits

Author SHA1 Message Date
f136aefe31 fix and up version 2022-09-24 14:13:50 +03:00
3 changed files with 27 additions and 12 deletions

View File

@@ -6,7 +6,7 @@
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-parent</artifactId>
<version>0.0.1</version>
<version>0.0.1.1</version>
<name>stbf-parent</name>
<description>Simple Telegram Bot Facade</description>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-parent</artifactId>
<version>0.0.1</version>
<version>0.0.1.1</version>
</parent>
<artifactId>stbf-pengrad</artifactId>
@@ -21,7 +21,7 @@
<dependency>
<groupId>com.github.pengrad</groupId>
<artifactId>java-telegram-bot-api</artifactId>
<version>[4.9.0,5.2.0]</version>
<version>6.2.0</version>
</dependency>
</dependencies>

View File

@@ -1,18 +1,18 @@
package ru.penkrat.stbf.impl.pengrad;
import static lombok.AccessLevel.PROTECTED;
import java.util.Optional;
import com.pengrad.telegrambot.model.CallbackQuery;
import com.pengrad.telegrambot.model.Chat;
import com.pengrad.telegrambot.model.Contact;
import com.pengrad.telegrambot.model.Message;
import com.pengrad.telegrambot.model.Update;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import ru.penkrat.stbf.api.BotRequest;
import java.util.Optional;
import static lombok.AccessLevel.PROTECTED;
@RequiredArgsConstructor
public class BotRequestImpl implements BotRequest {
@@ -52,10 +52,25 @@ public class BotRequestImpl implements BotRequest {
@Override
public Long getChatId() {
return Optional.of(update)
.map(Update::callbackQuery)
.map(CallbackQuery::message)
.orElseGet(() -> update.message()).chat().id();
return Optional.ofNullable(getMessage())
.map(Message::chat)
.map(Chat::id)
.orElse(null);
}
private Message getMessage() {
if (update != null) {
if (update.callbackQuery() != null) {
return update.callbackQuery().message();
}
if (update.message() != null) {
return update.message();
}
if (update.editedMessage() != null) {
return update.editedMessage();
}
}
return null;
}
}