Compare commits
No commits in common. "d13c4a051f56c9b2102707068e76c40e7635dbb2" and "72b08447c5e333326f95f3a9502c7ed0927d2ac3" have entirely different histories.
d13c4a051f
...
72b08447c5
19
pom.xml
19
pom.xml
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-bot</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
@ -37,24 +38,16 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
|
||||
<godfather.core.ver>0.0.51</godfather.core.ver>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.telegram/telegrambots -->
|
||||
<godfather.core.ver>0.0.51-SNAPSHOT</godfather.core.ver>
|
||||
<telegrambots.ver>6.3.0</telegrambots.ver>
|
||||
|
||||
<haiti.version>2.6.0</haiti.version>
|
||||
<haiti.version>2.0.0</haiti.version>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
|
||||
<plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
|
||||
<!-- https://mvnrepository.com/artifact/org.sonatype.plugins/nexus-staging-maven-plugin -->
|
||||
<plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-source-plugin -->
|
||||
<plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin -->
|
||||
<plugin.maven.javadoc.ver>3.5.0</plugin.maven.javadoc.ver>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-gpg-plugin -->
|
||||
<plugin.maven.javadoc.ver>3.4.0</plugin.maven.javadoc.ver>
|
||||
<plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
|
||||
<plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
|
||||
</properties>
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>telegram-bot</artifactId>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-consumer</artifactId>
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-consumer</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-consumer-main</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-consumer</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-consumer-quarkus</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-consumer</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-consumer-simple</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>telegram-bot</artifactId>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-context</artifactId>
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-context</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-context-main</artifactId>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package dev.struchkov.godfather.telegram.main.context;
|
||||
|
||||
import dev.struchkov.godfather.main.domain.ContextKey;
|
||||
import dev.struchkov.haiti.utils.Exceptions;
|
||||
import dev.struchkov.haiti.utils.container.ContextKey;
|
||||
|
||||
public final class BoxAnswerPayload {
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package dev.struchkov.godfather.telegram.main.context;
|
||||
|
||||
import dev.struchkov.godfather.main.domain.ContextKey;
|
||||
import dev.struchkov.haiti.utils.Exceptions;
|
||||
import dev.struchkov.haiti.utils.container.ContextKey;
|
||||
|
||||
public final class MailPayload {
|
||||
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-context</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-context-quarkus</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>telegram-context</artifactId>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-context-simple</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-bot</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-core</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-core-main</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>telegram-core</artifactId>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-core-quarkus</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-core</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-core-simple</artifactId>
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-bot</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-domain</artifactId>
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-domain</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-domain-main</artifactId>
|
||||
|
||||
@ -2,7 +2,7 @@ package dev.struchkov.godfather.telegram.domain.attachment;
|
||||
|
||||
import dev.struchkov.godfather.main.domain.content.Attachment;
|
||||
import dev.struchkov.haiti.utils.Parser;
|
||||
import dev.struchkov.haiti.utils.container.CompositeUrl;
|
||||
import dev.struchkov.haiti.utils.domain.CompositeUrl;
|
||||
|
||||
public class LinkAttachment extends Attachment {
|
||||
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
package dev.struchkov.godfather.telegram.domain.keyboard.button;
|
||||
|
||||
import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton;
|
||||
|
||||
import static dev.struchkov.haiti.utils.Inspector.Utils.nullPointer;
|
||||
import static dev.struchkov.haiti.utils.Inspector.isNotNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* Запрашивает у пользователя его контактный номер.
|
||||
@ -18,8 +16,7 @@ public class ContactButton implements KeyBoardButton {
|
||||
this.label = label;
|
||||
}
|
||||
|
||||
public static ContactButton contactButton(String label) {
|
||||
isNotNull(label, nullPointer("label"));
|
||||
public static ContactButton contactButton(@NotNull String label) {
|
||||
return new ContactButton(label);
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
package dev.struchkov.godfather.telegram.domain.keyboard.button;
|
||||
|
||||
import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton;
|
||||
|
||||
import static dev.struchkov.haiti.utils.Inspector.isNotNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class UrlButton implements KeyBoardButton {
|
||||
|
||||
@ -16,8 +15,7 @@ public class UrlButton implements KeyBoardButton {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public static UrlButton urlButton(String label, String url) {
|
||||
isNotNull(label, url);
|
||||
public static UrlButton urlButton(@NotNull String label, @NotNull String url) {
|
||||
return new UrlButton(label, url);
|
||||
}
|
||||
|
||||
@ -33,5 +31,4 @@ public class UrlButton implements KeyBoardButton {
|
||||
public String getUrl() {
|
||||
return url;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
package dev.struchkov.godfather.telegram.domain.keyboard.button;
|
||||
|
||||
import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton;
|
||||
|
||||
import static dev.struchkov.haiti.utils.Inspector.isNotNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class WebAppButton implements KeyBoardButton {
|
||||
|
||||
@ -16,8 +15,7 @@ public class WebAppButton implements KeyBoardButton {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public static WebAppButton webAppButton(String label, String url) {
|
||||
isNotNull(label, url);
|
||||
public static WebAppButton webAppButton(@NotNull String label, @NotNull String url) {
|
||||
return new WebAppButton(label, url);
|
||||
}
|
||||
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-domain</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-domain-quarkus</artifactId>
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-domain</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-domain-simple</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-bot</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-sender</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-sender</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-sender-main</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-sender</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-sender-quarkus</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-sender</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-sender-simple</artifactId>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.struchkov.godfather.telegram</groupId>
|
||||
<artifactId>telegram-bot</artifactId>
|
||||
<version>0.0.50-SNAPSHOT</version>
|
||||
<version>0.0.49-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>telegram-simple</artifactId>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user