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

Update FlanaBot._on_database_messages

Browse Source
This commit is contained in:
AlberLC
2023-11-07 08:29:28 +01:00
parent e415516b00
commit 4f5427093c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flanabot/bots/flana_bot.py
View File

@@ -12,7 +12,7 @@ import pymongo
import pytz import pytz
from flanaapis import InstagramLoginError, MediaNotFoundError, PlaceNotFoundError from flanaapis import InstagramLoginError, MediaNotFoundError, PlaceNotFoundError
from flanautils import return_if_first_empty from flanautils import return_if_first_empty
from multibot import BadRoleError, MultiBot, Platform, RegisteredCallback, Role, User, admin, bot_mentioned, constants as multibot_constants, group, inline, owner, reply from multibot import BadRoleError, MessagesFormat, MultiBot, Platform, RegisteredCallback, Role, User, admin, bot_mentioned, constants as multibot_constants, group, inline, owner, reply
from flanabot import constants from flanabot import constants
from flanabot.bots.connect_4_bot import Connect4Bot from flanabot.bots.connect_4_bot import Connect4Bot
@@ -50,7 +50,9 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
self.register(self._on_config, (multibot_constants.KEYWORDS['show'], multibot_constants.KEYWORDS['config'])) self.register(self._on_config, (multibot_constants.KEYWORDS['show'], multibot_constants.KEYWORDS['config']))
self.register(self._on_database_messages, (multibot_constants.KEYWORDS['last'], multibot_constants.KEYWORDS['message'])) self.register(self._on_database_messages, (multibot_constants.KEYWORDS['last'], multibot_constants.KEYWORDS['message']))
self.register(lambda message: self._on_database_messages(message, simple=True), (multibot_constants.KEYWORDS['last'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['simple'])) self.register(lambda message: self._on_database_messages(message, format=MessagesFormat.SIMPLE), (multibot_constants.KEYWORDS['last'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['simple']))
self.register(lambda message: self._on_database_messages(message, format=MessagesFormat.COMPLETE), (multibot_constants.KEYWORDS['last'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['all']))
self.register(lambda message: self._on_database_messages(message, format=MessagesFormat.COMPLETE), (multibot_constants.KEYWORDS['last'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['text']))
self.register(self._on_deactivate_tunnel, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['tunnel'])) self.register(self._on_deactivate_tunnel, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['tunnel']))
@@ -207,7 +209,7 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
@owner(send_negative=True) @owner(send_negative=True)
@inline(False) @inline(False)
async def _on_database_messages(self, message: Message, simple=False): async def _on_database_messages(self, message: Message, format=MessagesFormat.NORMAL):
if message.chat.is_group and not self.is_bot_mentioned(message): if message.chat.is_group and not self.is_bot_mentioned(message):
return return
@@ -277,7 +279,7 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, UberEatsBot, Weathe
)) ))
): ):
await self.send( await self.send(
self.format_messages(messages, timezone=pytz.timezone('Europe/Madrid'), simple=simple), self.format_messages(messages, timezone=pytz.timezone('Europe/Madrid'), format=format),
message message
) )
await self.delete_message(message) await self.delete_message(message)