5 Commits

Author SHA1 Message Date
AlberLC
54cada0649 Fix _on_choose 2022-06-23 04:31:45 +02:00
AlberLC
0f5d3c333a Fix commands at private 2022-06-23 04:13:36 +02:00
AlberLC
5fb55404cf Fix commands at private 2022-06-23 03:10:49 +02:00
AlberLC
2768d8e949 Fix commands at private 2022-06-23 02:17:59 +02:00
AlberLC
b0ca5a2ded Add ports to db local access 2022-06-23 02:17:33 +02:00
2 changed files with 18 additions and 11 deletions

View File

@@ -7,6 +7,8 @@ services:
mongodb:
image: mongo
ports:
- "27017:27017"
environment:
- MONGO_INITDB_ROOT_USERNAME=${MONGO_USER}
- MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD}

View File

@@ -269,7 +269,7 @@ class FlanaBot(MultiBot, ABC):
return_exceptions=True
)
if not message.is_inline and (self.is_bot_mentioned(message) or not message.chat.is_group):
if not message.is_inline and (self.is_bot_mentioned(message) or message.chat.is_private):
while not results.done():
if constants.SCRAPING_MESSAGE_WAITING_TIME <= time_module.perf_counter() - start_time:
bot_state_message = await self.send(random.choice(constants.SCRAPING_PHRASES), message)
@@ -296,12 +296,14 @@ class FlanaBot(MultiBot, ABC):
# HANDLERS #
# ---------------------------------------------- #
async def _on_bye(self, message: Message):
if not message.chat.is_group or self.is_bot_mentioned(message):
if message.chat.is_private or self.is_bot_mentioned(message):
await self.send_bye(message)
@bot_mentioned
async def _on_choose(self, message: Message):
discarded_words = {*constants.KEYWORDS['choose'], *constants.KEYWORDS['random'], self.name, f'<@{self.id}>'}
if message.chat.is_group and not self.is_bot_mentioned(message):
return
discarded_words = {*constants.KEYWORDS['choose'], *constants.KEYWORDS['random'], self.name.lower(), f'<@{self.id}>'}
if final_words := [word for word in message.text.split() if not flanautils.cartesian_product_string_matching(word.lower(), discarded_words, min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)]:
await self.send(random.choice(final_words), message)
else:
@@ -310,7 +312,7 @@ class FlanaBot(MultiBot, ABC):
async def _on_config_button_press(self, message: Message):
await self._accept_button_event(message)
if not message.buttons_info.presser_user.is_admin:
if message.buttons_info.presser_user.is_admin is False:
return
config = message.buttons_info.pressed_text.split()[1]
@@ -381,15 +383,17 @@ class FlanaBot(MultiBot, ABC):
async def _on_delete_original_config_show(self, message: Message):
await self._show_config('auto_delete_original', message)
@bot_mentioned
async def _on_dice(self, message: Message):
if message.chat.is_group and not self.is_bot_mentioned(message):
return
if top_number := flanautils.sum_numbers_in_text(message.text):
await self.send(random.randint(1, top_number), message)
else:
await self.send(random.choice(('¿De cuántas caras?', '¿Y el número?', '?', '🤔')), message)
async def _on_hello(self, message: Message):
if not message.chat.is_group or self.is_bot_mentioned(message):
if message.chat.is_private or self.is_bot_mentioned(message):
await self.send_hello(message)
async def _on_new_message_default(self, message: Message):
@@ -436,8 +440,10 @@ class FlanaBot(MultiBot, ABC):
def _distribute_poll_buttons(self, texts: Sequence[str]) -> list[list[str]]:
pass
@bot_mentioned
async def _on_poll(self, message: Message):
if message.chat.is_group and not self.is_bot_mentioned(message):
return
discarded_words = {*constants.KEYWORDS['poll'], self.name.lower(), f'<@{self.id}>'}
if final_options := [option.title() for option in message.text.split() if not flanautils.cartesian_product_string_matching(option.lower(), discarded_words, min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)]:
await self.send('Encuesta en curso...', self._distribute_poll_buttons(final_options), message, buttons_key=ButtonsGroup.POLL, contents={'poll': {'is_active': True, 'votes': {option: [] for option in final_options}}})
@@ -580,16 +586,15 @@ class FlanaBot(MultiBot, ABC):
if song_infos:
for song_info in song_infos:
await self.send_song_info(song_info, message)
elif self.is_bot_mentioned(message) or not message.chat.is_group:
elif self.is_bot_mentioned(message) or message.chat.is_private:
await self._manage_exceptions(SendError('No hay información musical en ese mensaje.'), message)
async def _on_stop_poll(self, message: Message):
if poll_message := message.replied_message:
if poll_message.contents.get('poll') is None:
return
elif (
self.is_bot_mentioned(message)
(message.chat.is_private or self.is_bot_mentioned(message))
and
flanautils.cartesian_product_string_matching(message.text, constants.KEYWORDS['poll'], min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)
and