diff --git a/pom.xml b/pom.xml index 5361ab2..5d55db1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,13 @@ 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.bot.godfather - telegram + dev.struchkov.godfather + telegram-bot + 0.0.2 pom - 0.0.1-RELEASE + - telegram-bot + telegram-core Telegram Bot @@ -16,31 +17,167 @@ https://github.com/Godfather-Bots/telegram-bot - 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. - + BSD 3-Clause "New" or "Revised" License + https://github.com/Godfather-Bots/godfather/blob/master/LICENSE + + GitHub + https://github.com/Godfather-Bots/telegram-bot/issues + - - SADTECH - https://sadtech.org - + + 17 + ${java.version} + ${java.version} + UTF-8 + UTF-8 + + 0.0.2 + 5.4.0.1 + + 3.9.0 + 1.6.8 + 3.2.1 + 3.3.1 + 3.0.1 + 1.4.15 + + + + + + dev.struchkov.godfather + bot-core + ${godfather.core.ver} + + + + org.telegram + telegrambots + ${telegrambots.ver} + + + + org.telegram + telegrambots-abilities + ${telegrambots.ver} + + + + org.telegram + telegrambotsextensions + ${telegrambots.ver} + + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${plugin.nexus.staging.ver} + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + com.thoughtworks.xstream + xstream + ${xstream.ver} + + + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.maven.source.ver} + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${plugin.maven.javadoc.ver} + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${plugin.maven.gpg.ver} + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${plugin.maven.compiler.ver} + + ${java.version} + ${java.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + + release + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + scm:git:https://github.com/Godfather-Bots/telegram-bot.git @@ -55,126 +192,12 @@ - - 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 - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 8 - 8 - - - - - uPagge Struchkov Mark - upagge@ya.ru - SADTECH - https://sadtech.org - https://uPagge.sadtech.org - - Project lead - - +3 + mark@struchkov.dev + https://mark.struchkov.dev diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramHookBot.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramHookBot.java deleted file mode 100644 index 05fcdf0..0000000 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramHookBot.java +++ /dev/null @@ -1,54 +0,0 @@ -//package org.sadtech.telegram.bot; -// -//import lombok.NonNull; -//import lombok.RequiredArgsConstructor; -//import org.sadtech.telegram.bot.config.TelegramWebHookConfig; -//import org.sadtech.telegram.bot.listen.EventDistributor; -//import org.sadtech.telegram.bot.listen.EventDistributorImpl; -//import org.telegram.telegrambots.bots.TelegramWebhookBot; -//import org.telegram.telegrambots.meta.api.methods.BotApiMethod; -//import org.telegram.telegrambots.meta.api.objects.Update; -//import org.telegram.telegrambots.meta.bots.AbsSender; -// -///** -// * TODO: Добавить описание класса. -// * -// * @author upagge [12.02.2020] -// */ -//@RequiredArgsConstructor -//public class TelegramHookBot extends TelegramWebhookBot implements TelegramBot { -// -// private final TelegramWebHookConfig webHookConfig; -// private EventDistributor eventDistributor; -// -// @Override -// public BotApiMethod onWebhookUpdateReceived(Update update) { -// return eventDistributor.processing(update); -// } -// -// @Override -// public String getBotUsername() { -// return webHookConfig.getBotUsername(); -// } -// -// @Override -// public String getBotToken() { -// return webHookConfig.getBotToken(); -// } -// -// @Override -// public String getBotPath() { -// return null; -// } -// -// @Override -// public AbsSender getAdsSender() { -// return this; -// } -// -// @Override -// public void initEventDistributor(@NonNull EventDistributorImpl eventDistributor) { -// this.eventDistributor = eventDistributor; -// } -// -//} diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/MessageMailConvert.java b/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/MessageMailConvert.java deleted file mode 100644 index a179e31..0000000 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/MessageMailConvert.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.sadtech.bot.godfather.telegram.convert; - -import lombok.AccessLevel; -import lombok.RequiredArgsConstructor; -import org.sadtech.social.core.domain.content.Mail; -import org.telegram.telegrambots.meta.api.objects.Message; - -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; - -/** - * TODO: Добавить описание класса. - * - * @author upagge [18.08.2019] - */ -@RequiredArgsConstructor(access = AccessLevel.PRIVATE) -public class MessageMailConvert { - - public static Mail apply(Message message) { - Mail mail = new Mail(); - mail.setPersonId(message.getChatId()); - mail.setAddDate(LocalDateTime.now()); - mail.setText(message.getText()); - mail.setCreateDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(message.getDate()), ZoneId.systemDefault())); - return mail; - } - -} diff --git a/telegram-bot/pom.xml b/telegram-core/pom.xml similarity index 50% rename from telegram-bot/pom.xml rename to telegram-core/pom.xml index d6d919a..c3fad5a 100644 --- a/telegram-bot/pom.xml +++ b/telegram-core/pom.xml @@ -3,23 +3,25 @@ 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.bot.godfather - telegram - 0.0.1-RELEASE + dev.struchkov.godfather + telegram-bot + 0.0.2 - telegram-bot - 0.0.1-RELEASE - jar + telegram-core + 0.0.2 Telegram Core Allows you to create bots for Telegram - https://github.com/uPagge/telegram-bot + + + false + - org.sadtech.social - social-bot + dev.struchkov.godfather + bot-core @@ -38,19 +40,20 @@ - - - uPagge - Struchkov Mark - upagge@ya.ru - SADTECH - https://sadtech.org - https://uPagge.sadtech.org - - Project lead - - +3 - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + ${skip.deploy} + + + + \ No newline at end of file diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/ProxyConfig.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/ProxyConfig.java similarity index 92% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/ProxyConfig.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/ProxyConfig.java index e576e23..79307d6 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/ProxyConfig.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/ProxyConfig.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.godfather.telegram; +package dev.struchkov.godfather.telegram; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramBot.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/TelegramBot.java similarity index 74% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramBot.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/TelegramBot.java index 3d76fd5..045397b 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramBot.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/TelegramBot.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.godfather.telegram; +package dev.struchkov.godfather.telegram; import lombok.NonNull; -import org.sadtech.bot.godfather.telegram.listen.EventDistributorImpl; +import dev.struchkov.godfather.telegram.listen.EventDistributorImpl; import org.telegram.telegrambots.meta.bots.AbsSender; /** diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramPollingBot.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/TelegramPollingBot.java similarity index 86% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramPollingBot.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/TelegramPollingBot.java index a14d544..7b9c013 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/TelegramPollingBot.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/TelegramPollingBot.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.godfather.telegram; +package dev.struchkov.godfather.telegram; import lombok.NonNull; -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 dev.struchkov.godfather.telegram.listen.EventDistributorImpl; +import dev.struchkov.godfather.telegram.config.TelegramPollingConfig; +import dev.struchkov.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/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java similarity index 61% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java index 5526da3..e6dbaf7 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/autoresponder/MessageAutoresponderTelegram.java @@ -1,11 +1,11 @@ -package org.sadtech.bot.godfather.telegram.autoresponder; +package dev.struchkov.godfather.telegram.autoresponder; +import dev.struchkov.godfather.context.domain.content.Mail; +import dev.struchkov.godfather.context.service.MessageService; +import dev.struchkov.godfather.context.service.sender.Sending; +import dev.struchkov.godfather.core.GeneralAutoResponder; +import dev.struchkov.godfather.core.domain.unit.MainUnit; import org.sadtech.autoresponder.repository.UnitPointerRepository; -import org.sadtech.social.bot.GeneralAutoResponder; -import org.sadtech.social.bot.domain.unit.MainUnit; -import org.sadtech.social.core.domain.content.Mail; -import org.sadtech.social.core.service.MessageService; -import org.sadtech.social.core.service.sender.Sending; import java.util.Set; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramPollingConfig.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/config/TelegramPollingConfig.java similarity index 81% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramPollingConfig.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/config/TelegramPollingConfig.java index 993bdbc..7855a75 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramPollingConfig.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/config/TelegramPollingConfig.java @@ -1,11 +1,11 @@ -package org.sadtech.bot.godfather.telegram.config; +package dev.struchkov.godfather.telegram.config; +import dev.struchkov.godfather.telegram.ProxyConfig; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.NonNull; -import org.sadtech.bot.godfather.telegram.ProxyConfig; /** * TODO: Добавить описание класса. diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramWebHookConfig.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/config/TelegramWebHookConfig.java similarity index 89% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramWebHookConfig.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/config/TelegramWebHookConfig.java index 51cfdf4..d6bb3f7 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/config/TelegramWebHookConfig.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/config/TelegramWebHookConfig.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.godfather.telegram.config; +package dev.struchkov.godfather.telegram.config; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/CallbackQueryConvert.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/CallbackQueryConvert.java similarity index 82% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/CallbackQueryConvert.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/CallbackQueryConvert.java index ab72b4c..25f7d72 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/convert/CallbackQueryConvert.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/CallbackQueryConvert.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.godfather.telegram.convert; +package dev.struchkov.godfather.telegram.convert; -import org.sadtech.social.core.domain.content.Mail; +import dev.struchkov.godfather.context.domain.content.Mail; import org.telegram.telegrambots.meta.api.objects.CallbackQuery; import java.time.LocalDateTime; diff --git a/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/MessageMailConvert.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/MessageMailConvert.java new file mode 100644 index 0000000..cce7661 --- /dev/null +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/convert/MessageMailConvert.java @@ -0,0 +1,57 @@ +package dev.struchkov.godfather.telegram.convert; + +import dev.struchkov.godfather.context.domain.content.Mail; +import dev.struchkov.godfather.context.domain.content.attachment.Attachment; +import dev.struchkov.godfather.context.domain.content.attachment.Link; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.MessageEntity; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * TODO: Добавить описание класса. + * + * @author upagge [18.08.2019] + */ +@RequiredArgsConstructor(access = AccessLevel.PRIVATE) +public class MessageMailConvert { + + public static Mail apply(Message message) { + Mail mail = new Mail(); + mail.setPersonId(message.getChatId()); + mail.setAddDate(LocalDateTime.now()); + mail.setText(message.getText()); + mail.setCreateDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(message.getDate()), ZoneId.systemDefault())); + List entities = message.getEntities(); + if (entities != null) { + mail.setAttachments(convertAttachments(entities)); + } + + if (message.getReplyToMessage() != null) { + mail.setForwardMail(Collections.singletonList(apply(message.getReplyToMessage()))); + } + + return mail; + } + + private static List convertAttachments(List entities) { + final List attachments = new ArrayList(); + for (MessageEntity entity : entities) { + String type = entity.getType(); + if ("text_link".equals(type)) { + Link link = new Link(); + link.setUrl(entity.getUrl()); + attachments.add(link); + } + } + return attachments; + } + +} diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributor.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributor.java similarity index 76% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributor.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributor.java index 7e68b63..c7589b9 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributor.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributor.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.godfather.telegram.listen; +package dev.struchkov.godfather.telegram.listen; import lombok.NonNull; import org.telegram.telegrambots.meta.api.objects.Update; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributorImpl.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributorImpl.java similarity index 81% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributorImpl.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributorImpl.java index c2fa39e..a0c925d 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/EventDistributorImpl.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/EventDistributorImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.godfather.telegram.listen; +package dev.struchkov.godfather.telegram.listen; +import dev.struchkov.godfather.context.service.MailService; import lombok.NonNull; -import org.sadtech.social.core.service.MailService; -import org.sadtech.bot.godfather.telegram.convert.CallbackQueryConvert; -import org.sadtech.bot.godfather.telegram.convert.MessageMailConvert; +import dev.struchkov.godfather.telegram.convert.CallbackQueryConvert; +import dev.struchkov.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/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramConnect.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/TelegramConnect.java similarity index 85% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramConnect.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/TelegramConnect.java index 0d6ea36..f73d826 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramConnect.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/TelegramConnect.java @@ -1,16 +1,15 @@ -package org.sadtech.bot.godfather.telegram.listen; +package dev.struchkov.godfather.telegram.listen; +import dev.struchkov.godfather.telegram.ProxyConfig; +import dev.struchkov.godfather.telegram.TelegramBot; +import dev.struchkov.godfather.telegram.TelegramPollingBot; +import dev.struchkov.godfather.telegram.config.TelegramPollingConfig; import lombok.extern.slf4j.Slf4j; -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; import org.telegram.telegrambots.meta.TelegramBotsApi; import org.telegram.telegrambots.meta.bots.AbsSender; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; import java.net.Authenticator; import java.net.PasswordAuthentication; @@ -23,10 +22,6 @@ import java.net.PasswordAuthentication; @Slf4j public class TelegramConnect { - static { - ApiContextInitializer.init(); - } - private TelegramBot telegramBot; public TelegramConnect(TelegramPollingConfig telegramPollingConfig) { @@ -66,21 +61,27 @@ public class TelegramConnect { } } - TelegramBotsApi botapi = new TelegramBotsApi(); + final TelegramBotsApi botapi; try { if (proxyConfig != null && proxyConfig.getHost() != null) { System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2"); System.setProperty("javax.net.debug", "all"); log.info(System.getProperty("https.protocols")); - DefaultBotOptions botOptions = ApiContext.getInstance(DefaultBotOptions.class); + DefaultBotOptions botOptions = new DefaultBotOptions(); botOptions.setProxyHost(proxyConfig.getHost()); botOptions.setProxyPort(proxyConfig.getPort()); botOptions.setProxyType(convertProxyType(proxyConfig.getType())); + + final TelegramPollingBot bot = new TelegramPollingBot(telegramPollingConfig, botOptions); + + + botapi = new TelegramBotsApi(DefaultBotSession.class); botapi.registerBot(bot); this.telegramBot = bot; } else { final TelegramPollingBot bot = new TelegramPollingBot(telegramPollingConfig); + botapi = new TelegramBotsApi(DefaultBotSession.class); botapi.registerBot(bot); this.telegramBot = bot; } diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramSender.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/TelegramSender.java similarity index 83% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramSender.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/TelegramSender.java index 54b1417..641e0bd 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/listen/TelegramSender.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/listen/TelegramSender.java @@ -1,15 +1,15 @@ -package org.sadtech.bot.godfather.telegram.listen; +package dev.struchkov.godfather.telegram.listen; +import dev.struchkov.godfather.context.domain.BoxAnswer; +import dev.struchkov.godfather.context.domain.keyboard.KeyBoard; +import dev.struchkov.godfather.context.domain.keyboard.KeyBoardButton; +import dev.struchkov.godfather.context.domain.keyboard.KeyBoardLine; +import dev.struchkov.godfather.context.domain.keyboard.button.KeyBoardButtonText; +import dev.struchkov.godfather.context.service.sender.SendType; +import dev.struchkov.godfather.context.service.sender.Sending; +import dev.struchkov.godfather.telegram.service.SendPreProcessing; 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; -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.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; @@ -64,7 +64,7 @@ public class TelegramSender implements Sending { keyBoard.getKeyBoardLines() .stream() .map(this::convertLint) - .collect(Collectors.toList()) + .toList() ); return inlineKeyboardMarkup; } diff --git a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/service/SendPreProcessing.java b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/service/SendPreProcessing.java similarity index 79% rename from telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/service/SendPreProcessing.java rename to telegram-core/src/main/java/dev/struchkov/godfather/telegram/service/SendPreProcessing.java index 3944cda..1406c1f 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/godfather/telegram/service/SendPreProcessing.java +++ b/telegram-core/src/main/java/dev/struchkov/godfather/telegram/service/SendPreProcessing.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.godfather.telegram.service; +package dev.struchkov.godfather.telegram.service; /** * // TODO: 18.09.2020 Добавить описание. diff --git a/telegram-core/telegram-core.iml b/telegram-core/telegram-core.iml new file mode 100644 index 0000000..4a4ce55 --- /dev/null +++ b/telegram-core/telegram-core.iml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file