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

Update timeout_for_media

Browse Source
This commit is contained in:
AlberLC
2022-09-21 19:03:01 +02:00
parent 68c0558f65
commit ff887b2cd7
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flanabot/bots/flana_bot.py
View File

@@ -15,7 +15,7 @@ import plotly.graph_objects
import pymongo import pymongo
from flanaapis import InstagramLoginError, MediaNotFoundError, Place, PlaceNotFoundError, WeatherEmoji, instagram, tiktok, twitter, youtube from flanaapis import InstagramLoginError, MediaNotFoundError, Place, PlaceNotFoundError, WeatherEmoji, instagram, tiktok, twitter, youtube
from flanautils import Media, MediaType, NotFoundError, OrderedSet, Source, TimeUnits, TraceMetadata, return_if_first_empty from flanautils import Media, MediaType, NotFoundError, OrderedSet, Source, TimeUnits, TraceMetadata, return_if_first_empty
from multibot import Action, BadRoleError, BotAction, ButtonsGroup, MultiBot, Role, SendError, User, admin, bot_mentioned, constants as multibot_constants, group, ignore_self_message, inline, reply from multibot import Action, BadRoleError, BotAction, ButtonsGroup, MultiBot, RegisteredCallback, Role, SendError, User, admin, bot_mentioned, constants as multibot_constants, group, ignore_self_message, inline, reply
from flanabot import constants from flanabot import constants
from flanabot.models import Chat, Message, Punishment, WeatherChart from flanabot.models import Chat, Message, Punishment, WeatherChart
@@ -298,7 +298,10 @@ class FlanaBot(MultiBot, ABC):
return options return options
async def _scrape_and_send(self, message: Message, audio_only=False) -> OrderedSet[Media]: async def _scrape_and_send(self, message: Message, audio_only=False) -> OrderedSet[Media]:
if not (medias := await self._search_medias(message, audio_only)): kwargs = {}
if self._parse_callbacks(message.text, [RegisteredCallback(..., [['sin'], ['timeout', 'limite']])]):
kwargs['timeout_for_media'] = None
if not (medias := await self._search_medias(message, audio_only, **kwargs)):
return OrderedSet() return OrderedSet()
sended_media_messages, _ = await self.send_medias(medias, message) sended_media_messages, _ = await self.send_medias(medias, message)

4
flanabot/bots/flana_disc_bot.py
View File

@@ -141,8 +141,8 @@ class FlanaDiscBot(DiscordBot, FlanaBot):
except AttributeError: except AttributeError:
raise BadRoleError(str(self._punish)) raise BadRoleError(str(self._punish))
async def _search_medias(self, message: Message, audio_only=False, timeout_for_media: int | float = None) -> OrderedSet[Media]: async def _search_medias(self, message: Message, audio_only=False, timeout_for_media: int | float = 15) -> OrderedSet[Media]:
return await super()._search_medias(message, audio_only, timeout_for_media=15) return await super()._search_medias(message, audio_only, timeout_for_media)
async def _unpunish(self, user: int | str | User, group_: int | str | Chat | Message, message: Message = None): async def _unpunish(self, user: int | str | User, group_: int | str | Chat | Message, message: Message = None):
user_id = self.get_user_id(user) user_id = self.get_user_id(user)

4
flanabot/bots/flana_tele_bot.py
View File

@@ -59,8 +59,8 @@ class FlanaTeleBot(TelegramBot, FlanaBot):
return [contact.user_id for contact in contacts_data.contacts] return [contact.user_id for contact in contacts_data.contacts]
async def _search_medias(self, message: Message, audio_only=False, timeout_for_media: int | float = None) -> OrderedSet[Media]: async def _search_medias(self, message: Message, audio_only=False, timeout_for_media: int | float = 30) -> OrderedSet[Media]:
return await super()._search_medias(message, audio_only, timeout_for_media=45) return await super()._search_medias(message, audio_only, timeout_for_media)
@user_client @user_client
async def _update_whitelist(self): async def _update_whitelist(self):