3 Commits

Author SHA1 Message Date
AlberLC
d137f220cc Fix message find by date 2022-06-29 06:48:06 +02:00
AlberLC
00323f99fb Update HEAT_NAMES 2022-06-27 05:08:08 +02:00
AlberLC
6237ccf8b6 Fix _on_choose 2022-06-27 04:59:14 +02:00
2 changed files with 23 additions and 9 deletions

View File

@@ -2,6 +2,7 @@ __all__ = ['FlanaBot']
import asyncio
import datetime
import math
import random
import re
import time as time_module
@@ -167,12 +168,12 @@ class FlanaBot(MultiBot, ABC):
last_2s_messages = Message.find({
'platform': self.platform.value,
'author': message.author.object_id,
'last_update': {'$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=2)}
'date': {'$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=2)}
})
last_7s_messages = Message.find({
'platform': self.platform.value,
'author': message.author.object_id,
'last_update': {'$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=7)}
'date': {'$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=7)}
})
if len(last_2s_messages) >= constants.FLOOD_2s_LIMIT or len(last_7s_messages) >= constants.FLOOD_7s_LIMIT:
@@ -313,10 +314,22 @@ class FlanaBot(MultiBot, ABC):
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)]:
for i in range(1, len(final_words) - 1):
if final_words[i] in ('al', 'del', 'to'):
n1 = final_words[i - 1]
n2 = final_words[i + 1]
await self.send(random.randint(n1, n2), message)
try:
n1 = flanautils.cast_number(final_words[i - 1])
except ValueError:
try:
n1 = flanautils.words_to_numbers(final_words[i - 1], ignore_no_numbers=False)
except KeyError:
continue
try:
n2 = flanautils.cast_number(final_words[i + 1])
except ValueError:
try:
n2 = flanautils.words_to_numbers(final_words[i + 1], ignore_no_numbers=False)
except KeyError:
continue
if final_words[i] in ('al', 'el', 'to'):
await self.send(random.randint(math.ceil(n1), math.floor(n2)), message)
return
await self.send(random.choice(final_words), message)
else:
@@ -401,7 +414,7 @@ class FlanaBot(MultiBot, ABC):
return
if top_number := flanautils.sum_numbers_in_text(message.text):
await self.send(random.randint(1, top_number), message)
await self.send(random.randint(1, math.floor(top_number)), message)
else:
await self.send(random.choice(('¿De cuántas caras?', '¿Y el número?', '?', '🤔')), message)

View File

@@ -21,9 +21,10 @@ HEAT_NAMES = [
'Canal Caliente',
'Canal Olor a Vasco',
'Verano Cordobés al Sol',
'Canal Ardiendo',
'abrid las putas ventanas y traed el extintor',
'Canal INFIERNO'
'Canal Ardiendo',
'Canal INFIERNO',
'🔥🔥🔥🔥🔥🔥🔥'
]
HOT_CHANNEL_ID = 493530483045564417