4 Commits

Author SHA1 Message Date
AlberLC
9e5f7a81ff Add user who pressed the button 2022-05-26 05:45:16 +02:00
AlberLC
28ff804d5a Improve discord user name printing 2022-05-25 05:30:09 +02:00
AlberLC
d47fdfb57e Fix bot insults ratio 2022-05-25 04:00:47 +02:00
AlberLC
20fb6e3223 Fix bot insults ratio 2022-05-25 02:55:28 +02:00
2 changed files with 6 additions and 5 deletions

View File

@@ -311,10 +311,10 @@ class FlanaBot(MultiBot, ABC):
# ---------------------------------------------- #
async def _on_button_press(self, message: Message):
await self._accept_button_event(message)
if message.author.is_admin is False:
if not message.button_pressed_user.is_admin:
return
match message.last_button_pressed:
match message.button_pressed_text:
case WeatherEmoji.ZOOM_IN.value:
buttons_message_type = ButtonsMessageType.WEATHER
message.weather_chart.zoom_in()
@@ -335,7 +335,7 @@ class FlanaBot(MultiBot, ABC):
buttons_message_type = ButtonsMessageType.WEATHER
trace_metadata_name = WeatherEmoji(emoji).name.lower()
message.weather_chart.trace_metadatas[trace_metadata_name].show = not message.weather_chart.trace_metadatas[trace_metadata_name].show
case _ if 'auto_' in (config := message.last_button_pressed.split()[1]):
case _ if 'auto_' in (config := message.button_pressed_text.split()[1]):
buttons_message_type = ButtonsMessageType.CONFIG
message.chat.config[config] = not message.chat.config[config]
message.save()
@@ -447,7 +447,7 @@ class FlanaBot(MultiBot, ABC):
(
message.chat.config['auto_insult']
and
random.random() < 0.5
random.random() < constants.INSULT_PROBABILITY
)
)
)
@@ -780,7 +780,7 @@ class FlanaBot(MultiBot, ABC):
bot_state_message: Message = await self.send('Descargando...', message)
if message.chat.is_group:
sended_info_message = await self.send(f'{message.author.name} compartió{self._medias_sended_info(medias)}', message)
sended_info_message = await self.send(f"{message.author.name.split('#')[0]} compartió{self._medias_sended_info(medias)}", message)
for media in medias:
if not media.content:

View File

@@ -13,6 +13,7 @@ from flanabot.models.weather_chart import WeatherChart
@dataclass(eq=False)
class Message(MultiBotMessage):
author: User = None
button_pressed_user: User = None
mentions: Iterable[User] = field(default_factory=list)
chat: Chat = None
replied_message: Message = None