Godfather-Bots/telegram-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release-0.0.1

Browse Source
This commit is contained in:
uPagge 2020-11-15 20:16:50 +03:00
parent 3210d337e1
commit 86995b4f7d
No known key found for this signature in database
GPG Key ID: A76EB343414E022E
16 changed files with 135 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
pom.xml
View File

@ -3,30 +3,49 @@
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>org.sadtech.telegram</groupId>
<groupId>org.sadtech.bot.godfather</groupId>
<artifactId>telegram</artifactId>
<packaging>pom</packaging>
<version>0.0.1-RELEASE</version>
<modules>
<module>bot</module>
<module>telegram-bot</module>
</modules>
<name>Telegram Bot</name>
<description>Allows you to create bots for Telegram</description>
<url>https://github.com/uPagge/telegram-bot</url>
<url>https://github.com/Godfather-Bots/telegram-bot</url>
<licenses>
<license>
<name>Apache 2 License</name>
<url>https://github.com/uPagge/telegram-bot/blob/master/LICENSE</url>
<distribution>repo</distribution>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
<comments>
Copyright 2010 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
</comments>
</license>
</licenses>
<organization>
<name>SADTECH</name>
<url>https://sadtech.org</url>
</organization>
<scm>
<connection>scm:git:https://github.com/uPagge/telegram-bot.git</connection>
<url>https://github.com/uPagge/telegram-bot</url>
<developerConnection>scm:git:https://github.com/uPagge/telegram-bot.git</developerConnection>
<tag>release-0.0.1</tag>
<connection>scm:git:https://github.com/Godfather-Bots/telegram-bot.git</connection>
<url>https://github.com/Godfather-Bots/telegram-bot</url>
<developerConnection>scm:git:https://github.com/Godfather-Bots/telegram-bot.git</developerConnection>
</scm>
<distributionManagement>
@ -36,6 +55,39 @@
</snapshotRepository>
</distributionManagement>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/Godfather-Bots/telegram-bot/issues</url>
</issueManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.sadtech.social</groupId>
<artifactId>social-bot</artifactId>
<version>1.0.0-RELEASE</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId>
<version>4.9.1</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots-abilities</artifactId>
<version>4.6</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambotsextensions</artifactId>
<version>4.4.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<profile>
<id>release</id>
@ -108,4 +160,33 @@
</profile>
</profiles>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>uPagge</id>
<name>Struchkov Mark</name>
<email>upagge@ya.ru</email>
<organization>SADTECH</organization>
<organizationUrl>https://sadtech.org</organizationUrl>
<url>https://uPagge.sadtech.org</url>
<roles>
<role>Project lead</role>
</roles>
<timezone>+3</timezone>
</developer>
</developers>
</project>

41
bot/pom.xml → telegram-bot/pom.xml
View File

@ -1,59 +1,56 @@
<?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>org.sadtech.bot.godfather</groupId>
<artifactId>telegram</artifactId>
<version>0.0.1-RELEASE</version>
</parent>
<groupId>org.sadtech.telegram</groupId>
<groupId>org.sadtech.telegrambot</groupId>
<artifactId>telegram-bot</artifactId>
<version>0.0.1-RELEASE</version>
<packaging>jar</packaging>
<name>Telegram Core</name>
<description>Allows you to create bots for Telegram</description>
<url>https://github.com/uPagge/telegram-bot</url>
<dependencies>
<dependency>
<groupId>org.sadtech.social</groupId>
<artifactId>social-bot</artifactId>
<version>1.0.0-RELEASE</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId>
<version>4.9.1</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots-abilities</artifactId>
<version>4.6</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambotsextensions</artifactId>
<version>4.4.0.1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>uPagge</id>
<name>Struchkov Mark</name>
<email>upagge@ya.ru</email>
<organization>SADTECH</organization>
<email>upagge@mail.ru</email>
<organizationUrl>https://sadtech.org</organizationUrl>
<url>https://uPagge.sadtech.org</url>
<roles>
<role>Project lead</role>
</roles>
<timezone>+3</timezone>
</developer>
</developers>

2
bot/src/main/java/org/sadtech/telegram/bot/ProxyConfig.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/ProxyConfig.java
View File

@ -1,4 +1,4 @@
package org.sadtech.telegram.bot;
package org.sadtech.bot.godfather.telegram;
import lombok.AllArgsConstructor;
import lombok.Builder;

4
bot/src/main/java/org/sadtech/telegram/bot/TelegramBot.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramBot.java
View File

@ -1,7 +1,7 @@
package org.sadtech.telegram.bot;
package org.sadtech.bot.godfather.telegram;
import lombok.NonNull;
import org.sadtech.telegram.bot.listen.EventDistributorImpl;
import org.sadtech.bot.godfather.telegram.listen.EventDistributorImpl;
import org.telegram.telegrambots.meta.bots.AbsSender;
/**

0
bot/src/main/java/org/sadtech/telegram/bot/TelegramHookBot.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramHookBot.java
View File

8
bot/src/main/java/org/sadtech/telegram/bot/TelegramPollingBot.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramPollingBot.java
View File

@ -1,9 +1,9 @@
package org.sadtech.telegram.bot;
package org.sadtech.bot.godfather.telegram;
import lombok.NonNull;
import org.sadtech.telegram.bot.config.TelegramPollingConfig;
import org.sadtech.telegram.bot.listen.EventDistributor;
import org.sadtech.telegram.bot.listen.EventDistributorImpl;
import org.sadtech.bot.godfather.telegram.listen.EventDistributorImpl;
import org.sadtech.bot.godfather.telegram.config.TelegramPollingConfig;
import org.sadtech.bot.godfather.telegram.listen.EventDistributor;
import org.telegram.telegrambots.bots.DefaultBotOptions;
import org.telegram.telegrambots.bots.TelegramLongPollingBot;
import org.telegram.telegrambots.meta.api.objects.Update;

2
bot/src/main/java/org/sadtech/telegram/bot/autoresponder/MessageAutoresponderTelegram.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java
View File

@ -1,4 +1,4 @@
package org.sadtech.telegram.bot.autoresponder;
package org.sadtech.bot.godfather.telegram.autoresponder;
import org.sadtech.autoresponder.repository.UnitPointerRepository;
import org.sadtech.social.bot.GeneralAutoResponder;

4
bot/src/main/java/org/sadtech/telegram/bot/config/TelegramPollingConfig.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramPollingConfig.java
View File

@ -1,11 +1,11 @@
package org.sadtech.telegram.bot.config;
package org.sadtech.bot.godfather.telegram.config;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import org.sadtech.telegram.bot.ProxyConfig;
import org.sadtech.bot.godfather.telegram.ProxyConfig;
/**
* TODO: Добавить описание класса.

2
bot/src/main/java/org/sadtech/telegram/bot/config/TelegramWebHookConfig.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramWebHookConfig.java
View File

@ -1,4 +1,4 @@
package org.sadtech.telegram.bot.config;
package org.sadtech.bot.godfather.telegram.config;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
bot/src/main/java/org/sadtech/telegram/bot/convert/CallbackQueryConvert.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/CallbackQueryConvert.java
View File

@ -1,4 +1,4 @@
package org.sadtech.telegram.bot.convert;
package org.sadtech.bot.godfather.telegram.convert;
import org.sadtech.social.core.domain.content.Mail;
import org.telegram.telegrambots.meta.api.objects.CallbackQuery;

2
bot/src/main/java/org/sadtech/telegram/bot/convert/MessageMailConvert.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/MessageMailConvert.java
View File

@ -1,4 +1,4 @@
package org.sadtech.telegram.bot.convert;
package org.sadtech.bot.godfather.telegram.convert;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;

2
bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributor.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributor.java
View File

@ -1,4 +1,4 @@
package org.sadtech.telegram.bot.listen;
package org.sadtech.bot.godfather.telegram.listen;
import lombok.NonNull;
import org.telegram.telegrambots.meta.api.objects.Update;

6
bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributorImpl.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributorImpl.java
View File

@ -1,9 +1,9 @@
package org.sadtech.telegram.bot.listen;
package org.sadtech.bot.godfather.telegram.listen;
import lombok.NonNull;
import org.sadtech.social.core.service.MailService;
import org.sadtech.telegram.bot.convert.CallbackQueryConvert;
import org.sadtech.telegram.bot.convert.MessageMailConvert;
import org.sadtech.bot.godfather.telegram.convert.CallbackQueryConvert;
import org.sadtech.bot.godfather.telegram.convert.MessageMailConvert;
import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
import org.telegram.telegrambots.meta.api.objects.Message;
import org.telegram.telegrambots.meta.api.objects.Update;

10
bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramConnect.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramConnect.java
View File

@ -1,10 +1,10 @@
package org.sadtech.telegram.bot.listen;
package org.sadtech.bot.godfather.telegram.listen;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.telegram.bot.ProxyConfig;
import org.sadtech.telegram.bot.TelegramBot;
import org.sadtech.telegram.bot.TelegramPollingBot;
import org.sadtech.telegram.bot.config.TelegramPollingConfig;
import org.sadtech.bot.godfather.telegram.ProxyConfig;
import org.sadtech.bot.godfather.telegram.TelegramBot;
import org.sadtech.bot.godfather.telegram.TelegramPollingBot;
import org.sadtech.bot.godfather.telegram.config.TelegramPollingConfig;
import org.telegram.telegrambots.ApiContextInitializer;
import org.telegram.telegrambots.bots.DefaultBotOptions;
import org.telegram.telegrambots.meta.ApiContext;

4
bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramSender.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramSender.java
View File

@ -1,7 +1,8 @@
package org.sadtech.telegram.bot.listen;
package org.sadtech.bot.godfather.telegram.listen;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.godfather.telegram.service.SendPreProcessing;
import org.sadtech.social.core.domain.BoxAnswer;
import org.sadtech.social.core.domain.keyboard.KeyBoard;
import org.sadtech.social.core.domain.keyboard.KeyBoardButton;
@ -9,7 +10,6 @@ import org.sadtech.social.core.domain.keyboard.KeyBoardLine;
import org.sadtech.social.core.domain.keyboard.button.KeyBoardButtonText;
import org.sadtech.social.core.service.sender.SendType;
import org.sadtech.social.core.service.sender.Sending;
import org.sadtech.telegram.bot.service.SendPreProcessing;
import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard;

2
bot/src/main/java/org/sadtech/telegram/bot/service/SendPreProcessing.java → telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/service/SendPreProcessing.java
View File

@ -1,4 +1,4 @@
package org.sadtech.telegram.bot.service;
package org.sadtech.bot.godfather.telegram.service;
/**
* // TODO: 18.09.2020 Добавить описание.