AbstractHandler wrap method addition, updated start text content and added buttons, changed MessageData to InboundMessage, better logging, code quality improvements, changed env files naming

This commit is contained in:
miloszowi
2021-10-11 17:20:39 +02:00
parent fb223556cb
commit ea2fddff40
19 changed files with 142 additions and 115 deletions

View File

@@ -3,7 +3,6 @@ from telegram.ext.commandhandler import CommandHandler
from telegram.update import Update
from bot.handler.abstractHandler import AbstractHandler
from bot.message.messageData import MessageData
from bot.message.replier import Replier
from config.contents import joined, not_joined
from exception.notFoundException import NotFoundException
@@ -17,25 +16,20 @@ class JoinHandler(AbstractHandler):
action: str = 'join'
def __init__(self) -> None:
self.bot_handler = CommandHandler(self.action, self.handle)
self.bot_handler = CommandHandler(self.action, self.wrap)
self.user_repository = UserRepository()
def handle(self, update: Update, context: CallbackContext) -> None:
try:
message_data = MessageData.create_from_arguments(update, context)
except Exception as e:
return Replier.markdown(update, str(e))
user = self.user_repository.get_by_id(self.inbound.user_id)
try:
user = self.user_repository.get_by_id(message_data.user_id)
if user.is_in_chat(self.inbound.chat_id):
return Replier.markdown(update, Replier.interpolate(not_joined, self.inbound))
if user.is_in_chat(message_data.chat_id):
return Replier.markdown(update, Replier.interpolate(not_joined, message_data))
user.add_to_chat(message_data.chat_id)
user.add_to_chat(self.inbound.chat_id)
self.user_repository.save(user)
except NotFoundException:
self.user_repository.save_by_message_data(message_data)
self.user_repository.save_by_inbound_message(self.inbound)
Replier.markdown(update, Replier.interpolate(joined, message_data))
Logger.action(message_data, self.action)
Replier.markdown(update, Replier.interpolate(joined, self.inbound))
Logger.action(self.inbound, self.action)