spawnrys/flanabot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add minor changes

Browse Source
This commit is contained in:
AlberLC
2023-05-06 05:36:29 +02:00
parent 29ebfd5e26
commit a9a79b2705
1 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
flanabot/bots/flana_bot.py
View File

@@ -226,18 +226,18 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
async def _on_delete(self, message: Message): async def _on_delete(self, message: Message):
if message.replied_message: if message.replied_message:
if ( if (
self.is_bot_mentioned(message) self.is_bot_mentioned(message)
and and
(message.author.is_admin or message.replied_message.author.id == self.id) (message.author.is_admin or message.replied_message.author.id == self.id)
): ):
flanautils.do_later(flanautils.text_to_time(message.text).total_seconds(), self.delete_message, message.replied_message) flanautils.do_later(flanautils.text_to_time(message.text).total_seconds(), self.delete_message, message.replied_message)
await self.delete_message(message) await self.delete_message(message)
elif message.chat.is_group and self.is_bot_mentioned(message): elif message.chat.is_group and self.is_bot_mentioned(message):
await self.send_negative(message) await self.send_negative(message)
elif ( elif (
(message.chat.is_private or self.is_bot_mentioned(message)) (message.chat.is_private or self.is_bot_mentioned(message))
and and
(n_messages := flanautils.text_to_number(message.text)) (n_messages := flanautils.text_to_number(message.text))
): ):
if message.author.is_admin is False: if message.author.is_admin is False:
await self.send_negative(message) await self.send_negative(message)
@@ -256,13 +256,13 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
async def _on_help(self, message: Message): async def _on_help(self, message: Message):
now = datetime.timedelta(seconds=time.time()) now = datetime.timedelta(seconds=time.time())
if ( if (
message.chat.is_group message.chat.is_group
and and
not self.is_bot_mentioned(message) not self.is_bot_mentioned(message)
or or
self.help_calls.get(message.chat.id) self.help_calls.get(message.chat.id)
and and
now - self.help_calls[message.chat.id] <= datetime.timedelta(minutes=1) now - self.help_calls[message.chat.id] <= datetime.timedelta(minutes=1)
): ):
return return
@@ -289,39 +289,39 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
if message.is_inline: if message.is_inline:
await self._on_scraping(message) await self._on_scraping(message)
elif ( elif (
( (
message.chat.is_group message.chat.is_group
and
not self.is_bot_mentioned(message)
and
not message.chat.config['auto_scraping']
or
not await self._on_scraping(message, scrape_replied=False)
)
and and
message.author.id != self.owner_id not self.is_bot_mentioned(message)
and and
( not message.chat.config['auto_scraping']
not message.replied_message or
or not await self._on_scraping(message, scrape_replied=False)
message.replied_message.author.id != self.id )
or and
not message.replied_message.medias message.author.id != self.owner_id
) and
(
not message.replied_message
or
message.replied_message.author.id != self.id
or
not message.replied_message.medias
)
and
(
self.is_bot_mentioned(message)
or
message.chat.config['auto_insult']
and and
( random.random() < constants.INSULT_PROBABILITY
self.is_bot_mentioned(message) )
or and
message.chat.config['auto_insult'] (
and not self.tunnel_chat
random.random() < constants.INSULT_PROBABILITY or
) self.tunnel_chat != message.chat
and )
(
not self.tunnel_chat
or
self.tunnel_chat != message.chat
)
): ):
await self.send_insult(message) await self.send_insult(message)
@@ -336,9 +336,9 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
chat = await self.get_chat(chat.id) chat = await self.get_chat(chat.id)
chat.pull_from_database(overwrite_fields=('_id', 'config', 'ubereats')) chat.pull_from_database(overwrite_fields=('_id', 'config', 'ubereats'))
if ( if (
chat.ubereats['next_execution'] chat.ubereats['next_execution']
and and
(delta_time := chat.ubereats['next_execution'] - datetime.datetime.now(datetime.timezone.utc)) > datetime.timedelta() (delta_time := chat.ubereats['next_execution'] - datetime.datetime.now(datetime.timezone.utc)) > datetime.timedelta()
): ):
flanautils.do_later(delta_time, self.start_ubereats, chat) flanautils.do_later(delta_time, self.start_ubereats, chat)
else: else:
@@ -413,15 +413,15 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
async def _on_tunnel_message(self, message: Message): async def _on_tunnel_message(self, message: Message):
if ( if (
not self.tunnel_chat not self.tunnel_chat
or or
self._parse_callbacks( self._parse_callbacks(
message.text, message.text,
[ [
RegisteredCallback(..., (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['tunnel'])), RegisteredCallback(..., (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['tunnel'])),
RegisteredCallback(..., (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['tunnel'])) RegisteredCallback(..., (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['tunnel']))
] ]
) )
): ):
return return