Update to 3.0.1 #98

Merged
profitroll merged 52 commits from dev into main 2024-05-15 00:19:04 +03:00
Showing only changes of commit fc14cad3ff - Show all commits

View File

@ -46,6 +46,7 @@ class PyroClient(Client):
def __init__( def __init__(
self, self,
name: str = "bot_client", name: str = "bot_client",
owner: Union[int, None] = None,
config: Union[Dict[str, Any], None] = None, config: Union[Dict[str, Any], None] = None,
config_path: Union[str, Path] = Path("config.json"), config_path: Union[str, Path] = Path("config.json"),
api_id: Union[int, None] = None, api_id: Union[int, None] = None,
@ -58,6 +59,8 @@ class PyroClient(Client):
sleep_threshold: int = 120, sleep_threshold: int = 120,
max_concurrent_transmissions: int = 1, max_concurrent_transmissions: int = 1,
commands_source: Union[Dict[str, dict], None] = None, commands_source: Union[Dict[str, dict], None] = None,
scoped_commands: Union[bool, None] = None,
i18n_bot_info: bool = False,
scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = None, scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = None,
**kwargs, **kwargs,
): ):
@ -93,12 +96,16 @@ class PyroClient(Client):
else max_concurrent_transmissions, else max_concurrent_transmissions,
**kwargs, **kwargs,
) )
self.owner: int = self.config["bot"]["owner"] self.owner: int = self.config["bot"]["owner"] if owner is None else owner
self.commands: List[PyroCommand] = [] self.commands: List[PyroCommand] = []
self.commands_source: Dict[str, dict] = ( self.commands_source: Dict[str, dict] = (
self.config["commands"] if commands_source is None else commands_source self.config["commands"] if commands_source is None else commands_source
) )
self.scoped_commands: bool = self.config["bot"]["scoped_commands"] self.scoped_commands: bool = (
self.config["bot"]["scoped_commands"]
if scoped_commands is None
else scoped_commands
)
self.start_time: float = 0 self.start_time: float = 0
self.bot_locale: BotLocale = BotLocale( self.bot_locale: BotLocale = BotLocale(
@ -116,6 +123,8 @@ class PyroClient(Client):
self.scopes_placeholders: Dict[str, int] = {"owner": self.owner} self.scopes_placeholders: Dict[str, int] = {"owner": self.owner}
self.i18n_bot_info: bool = i18n_bot_info
async def start(self, register_commands: bool = True) -> None: async def start(self, register_commands: bool = True) -> None:
await super().start() await super().start()
@ -129,51 +138,53 @@ class PyroClient(Client):
getpid(), getpid(),
) )
# Register default bot's info if self.i18n_bot_info:
try: # Register default bot's info
await self.set_bot_info( try:
name=self._("name", "bot"), await self.set_bot_info(
about=self._("about", "bot"), name=self._("name", "bot"),
description=self._("description", "bot"), about=self._("about", "bot"),
lang_code="", description=self._("description", "bot"),
) lang_code="",
logger.info( )
"Bot's info for the default locale %s has been updated", logger.info(
self.default_locale, "Bot's info for the default locale %s has been updated",
) self.default_locale,
except KeyError: )
logger.warning( except KeyError:
"Default locale %s has incorrect keys or values in bot section", logger.warning(
self.default_locale, "Default locale %s has incorrect keys or values in bot section",
) self.default_locale,
# Register bot's info for each available locale
for locale_code in self.locales:
locale = self.locales[locale_code]
if "metadata" not in locale or ("codes" not in locale["metadata"]):
logger.warning(
"Locale %s is missing metadata or metadata.codes key", locale_code
) )
continue
for code in locale["metadata"]["codes"]: # Register bot's info for each available locale
try: for locale_code in self.locales:
await self.set_bot_info( locale = self.locales[locale_code]
name=locale["bot"]["name"],
about=locale["bot"]["about"], if "metadata" not in locale or ("codes" not in locale["metadata"]):
description=locale["bot"]["description"],
lang_code=code,
)
logger.info(
"Bot's info for the locale %s has been updated",
self.default_locale,
)
except KeyError:
logger.warning( logger.warning(
"Locale %s has incorrect keys or values in bot section", "Locale %s is missing metadata or metadata.codes key",
locale_code, locale_code,
) )
continue
for code in locale["metadata"]["codes"]:
try:
await self.set_bot_info(
name=locale["bot"]["name"],
about=locale["bot"]["about"],
description=locale["bot"]["description"],
lang_code=code,
)
logger.info(
"Bot's info for the locale %s has been updated",
self.default_locale,
)
except KeyError:
logger.warning(
"Locale %s has incorrect keys or values in bot section",
locale_code,
)
# Send a message to the bot's reports chat about the startup # Send a message to the bot's reports chat about the startup
try: try: