diff --git a/pom.xml b/pom.xml
index 2764a81..a28677c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,30 +3,49 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- org.sadtech.telegram
+ org.sadtech.bot.godfather
telegram
pom
0.0.1-RELEASE
- bot
+ telegram-bot
Telegram Bot
Allows you to create bots for Telegram
- https://github.com/uPagge/telegram-bot
+ https://github.com/Godfather-Bots/telegram-bot
- Apache 2 License
- https://github.com/uPagge/telegram-bot/blob/master/LICENSE
- repo
+ Apache License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
+
+
+ SADTECH
+ https://sadtech.org
+
+
- scm:git:https://github.com/uPagge/telegram-bot.git
- https://github.com/uPagge/telegram-bot
- scm:git:https://github.com/uPagge/telegram-bot.git
- release-0.0.1
+ scm:git:https://github.com/Godfather-Bots/telegram-bot.git
+ https://github.com/Godfather-Bots/telegram-bot
+ scm:git:https://github.com/Godfather-Bots/telegram-bot.git
@@ -36,6 +55,39 @@
+
+ GitHub
+ https://github.com/Godfather-Bots/telegram-bot/issues
+
+
+
+
+
+ org.sadtech.social
+ social-bot
+ 1.0.0-RELEASE
+
+
+
+ org.telegram
+ telegrambots
+ 4.9.1
+
+
+
+ org.telegram
+ telegrambots-abilities
+ 4.6
+
+
+
+ org.telegram
+ telegrambotsextensions
+ 4.4.0.1
+
+
+
+
release
@@ -108,4 +160,33 @@
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.0
+
+
+ 8
+
+
+
+
+
+
+
+ uPagge
+ Struchkov Mark
+ upagge@ya.ru
+ SADTECH
+ https://sadtech.org
+ https://uPagge.sadtech.org
+
+ Project lead
+
+ +3
+
+
+
\ No newline at end of file
diff --git a/bot/pom.xml b/telegram-bot/pom.xml
similarity index 57%
rename from bot/pom.xml
rename to telegram-bot/pom.xml
index ec87bc2..efc2346 100644
--- a/bot/pom.xml
+++ b/telegram-bot/pom.xml
@@ -1,59 +1,56 @@
-
+
4.0.0
+
+ org.sadtech.bot.godfather
+ telegram
+ 0.0.1-RELEASE
+
- org.sadtech.telegram
+ org.sadtech.telegrambot
telegram-bot
0.0.1-RELEASE
jar
+ Telegram Core
+ Allows you to create bots for Telegram
+ https://github.com/uPagge/telegram-bot
+
org.sadtech.social
social-bot
- 1.0.0-RELEASE
org.telegram
telegrambots
- 4.9.1
org.telegram
telegrambots-abilities
- 4.6
org.telegram
telegrambotsextensions
- 4.4.0.1
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 8
-
-
-
-
-
-
-
uPagge
Struchkov Mark
+ upagge@ya.ru
SADTECH
- upagge@mail.ru
+ https://sadtech.org
+ https://uPagge.sadtech.org
+
+ Project lead
+
+ +3
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/ProxyConfig.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/ProxyConfig.java
similarity index 92%
rename from bot/src/main/java/org/sadtech/telegram/bot/ProxyConfig.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/ProxyConfig.java
index b157b95..e576e23 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/ProxyConfig.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/ProxyConfig.java
@@ -1,4 +1,4 @@
-package org.sadtech.telegram.bot;
+package org.sadtech.bot.godfather.telegram;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/TelegramBot.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramBot.java
similarity index 74%
rename from bot/src/main/java/org/sadtech/telegram/bot/TelegramBot.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramBot.java
index 1c39f70..3d76fd5 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/TelegramBot.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramBot.java
@@ -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;
/**
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/TelegramHookBot.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramHookBot.java
similarity index 100%
rename from bot/src/main/java/org/sadtech/telegram/bot/TelegramHookBot.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramHookBot.java
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/TelegramPollingBot.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramPollingBot.java
similarity index 86%
rename from bot/src/main/java/org/sadtech/telegram/bot/TelegramPollingBot.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramPollingBot.java
index 7ff6de6..a14d544 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/TelegramPollingBot.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramPollingBot.java
@@ -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;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/autoresponder/MessageAutoresponderTelegram.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java
similarity index 93%
rename from bot/src/main/java/org/sadtech/telegram/bot/autoresponder/MessageAutoresponderTelegram.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java
index f01ca8f..5526da3 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/autoresponder/MessageAutoresponderTelegram.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java
@@ -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;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/config/TelegramPollingConfig.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramPollingConfig.java
similarity index 81%
rename from bot/src/main/java/org/sadtech/telegram/bot/config/TelegramPollingConfig.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramPollingConfig.java
index eb41ce9..993bdbc 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/config/TelegramPollingConfig.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramPollingConfig.java
@@ -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: Добавить описание класса.
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/config/TelegramWebHookConfig.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramWebHookConfig.java
similarity index 89%
rename from bot/src/main/java/org/sadtech/telegram/bot/config/TelegramWebHookConfig.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramWebHookConfig.java
index d5e2862..51cfdf4 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/config/TelegramWebHookConfig.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramWebHookConfig.java
@@ -1,4 +1,4 @@
-package org.sadtech.telegram.bot.config;
+package org.sadtech.bot.godfather.telegram.config;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/convert/CallbackQueryConvert.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/CallbackQueryConvert.java
similarity index 91%
rename from bot/src/main/java/org/sadtech/telegram/bot/convert/CallbackQueryConvert.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/CallbackQueryConvert.java
index 4d680e1..ab72b4c 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/convert/CallbackQueryConvert.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/CallbackQueryConvert.java
@@ -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;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/convert/MessageMailConvert.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/MessageMailConvert.java
similarity index 94%
rename from bot/src/main/java/org/sadtech/telegram/bot/convert/MessageMailConvert.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/MessageMailConvert.java
index 54fb355..a179e31 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/convert/MessageMailConvert.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/MessageMailConvert.java
@@ -1,4 +1,4 @@
-package org.sadtech.telegram.bot.convert;
+package org.sadtech.bot.godfather.telegram.convert;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributor.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributor.java
similarity index 76%
rename from bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributor.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributor.java
index cd4b44e..7e68b63 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributor.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributor.java
@@ -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;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributorImpl.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributorImpl.java
similarity index 84%
rename from bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributorImpl.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributorImpl.java
index cb596ff..c2fa39e 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/listen/EventDistributorImpl.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributorImpl.java
@@ -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;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramConnect.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramConnect.java
similarity index 93%
rename from bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramConnect.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramConnect.java
index 981c616..0d6ea36 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramConnect.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramConnect.java
@@ -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;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramSender.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramSender.java
similarity index 96%
rename from bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramSender.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramSender.java
index 1e3f08d..54b1417 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/listen/TelegramSender.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramSender.java
@@ -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;
diff --git a/bot/src/main/java/org/sadtech/telegram/bot/service/SendPreProcessing.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/service/SendPreProcessing.java
similarity index 79%
rename from bot/src/main/java/org/sadtech/telegram/bot/service/SendPreProcessing.java
rename to telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/service/SendPreProcessing.java
index fc6fd2f..3944cda 100644
--- a/bot/src/main/java/org/sadtech/telegram/bot/service/SendPreProcessing.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/service/SendPreProcessing.java
@@ -1,4 +1,4 @@
-package org.sadtech.telegram.bot.service;
+package org.sadtech.bot.godfather.telegram.service;
/**
* // TODO: 18.09.2020 Добавить описание.