ruslan/stbf
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Compare commits

base: ruslan:05af2f05a4240384a4fb9547c9c02c8a5803a2d6
Branches Tags
ruslan:master ruslan:0.0.1
ruslan:stbf-parent-0.0.1
..
compare: ruslan:0.0.1
Branches Tags
ruslan:master ruslan:0.0.1
ruslan:stbf-parent-0.0.1

1 Commits
05af2f05a4 ... 0.0.1

Author SHA1 Message Date
Ruslan Penkrat
f136aefe31 fix and up version 2022-09-24 14:13:50 +03:00
9 changed files with 39 additions and 24 deletions
Expand all files Collapse all files

4
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1.1</version>
<name>stbf-parent</name>
<description>Simple Telegram Bot Facade</description>
@@ -14,7 +14,7 @@
<scm>
<connection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</connection>
<developerConnection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</developerConnection>
<tag>HEAD</tag>
<tag>stbf-parent-0.0.1</tag>
</scm>
<licenses>

2
stbf-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</parent>
<artifactId>stbf-api</artifactId>

4
stbf-common/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>stbf-parent</artifactId>
<groupId>ru.penkrat.stbf</groupId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</parent>
<artifactId>stbf-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-api</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>

2
stbf-demo/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>stbf-parent</artifactId>
<groupId>ru.penkrat.stbf</groupId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</parent>
<groupId>ru.penkrat.stbf</groupId>

6
stbf-pengrad/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1.1</version>
</parent>
<artifactId>stbf-pengrad</artifactId>
@@ -16,12 +16,12 @@
<dependency>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-api</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</dependency>
<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>

33
stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotRequestImpl.java
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;
}
}

4
stbf-rubenlagus/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>stbf-parent</artifactId>
<groupId>ru.penkrat.stbf</groupId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</parent>
<artifactId>stbf-rubenlagus</artifactId>
@@ -15,7 +15,7 @@
<dependency>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-api</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>

2
stbf-templates/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>stbf-parent</artifactId>
<groupId>ru.penkrat.stbf</groupId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</parent>
<artifactId>stbf-templates</artifactId>
<properties>

6
stbf-test/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>stbf-parent</artifactId>
<groupId>ru.penkrat.stbf</groupId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</parent>
<artifactId>stbf-test</artifactId>
@@ -14,12 +14,12 @@
<dependency>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-api</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>ru.penkrat.stbf</groupId>
<artifactId>stbf-common</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.1</version>
<scope>test</scope>
</dependency>
<dependency>