diff --git a/heroku/langpacks/en.yml b/heroku/langpacks/en.yml index ede8121..9a4fed2 100644 --- a/heroku/langpacks/en.yml +++ b/heroku/langpacks/en.yml @@ -520,8 +520,9 @@ loader: loaded: "🪐 Module {}{} loaded {}{}{}{}{}{}{}" no_class: "What class needs to be unloaded?" unloaded: "{} Module {} unloaded." - modules_unloaded: " Unloaded {unloaded} modules. Failed to unload {not_unloaded} modules.\n
\n{errors}\n
" + modules_unloaded: " Unloaded {unloaded_num} modules:\n
{unloaded}
" not_unloaded: "🚫 Module not unloaded." + modules_not_unloaded: "🚫 Failed to unload {not_unloaded} modules.\n
{errors}
" requirements_failed: "🚫 Requirements installation failed" requirements_restarted: "🚀 Your userbot is restarted, after restart, install the module again." requirements_installing: "🚀 Installing requirements:\n\n{}" diff --git a/heroku/langpacks/ru.yml b/heroku/langpacks/ru.yml index 64d1816..7d2bd3a 100644 --- a/heroku/langpacks/ru.yml +++ b/heroku/langpacks/ru.yml @@ -481,8 +481,9 @@ loader: loaded: "🪐 Модуль {}{} загружен {}{}{}{}{}{}{}" no_class: "А что выгружать то?" unloaded: "{} Модуль {} выгружен." - modules_unloaded: " Выгружено {unloaded} модулей. Не удалось выгрузить {not_unloaded} модулей.\n
\n{errors}\n
" + modules_unloaded: " Выгружено {unloaded_num} модулей:\n
{unloaded}
" not_unloaded: "🚫 Модуль не выгружен." + modules_not_unloaded: "🚫 Не удалось выгрузить {not_unloaded} модулей.\n
{errors}
" requirements_failed: "🚫 Ошибка установки зависимостей" requirements_restarted: "🚀 Ваш юзербот перезагружается, после перезагрузки выполните установку модуля еще раз." requirements_installing: "🚀 Устанавливаю зависимости:\n\n{}" diff --git a/heroku/modules/loader.py b/heroku/modules/loader.py index 8831309..0550e15 100644 --- a/heroku/modules/loader.py +++ b/heroku/modules/loader.py @@ -1077,7 +1077,9 @@ class LoaderMod(loader.Module): else: modules = [m for m in args.split("\n") if m] + success = [] errors = [] + msg = "" for module in modules: status = await self.unload_module(module) if "🚫" in status or "😖" in status: @@ -1085,14 +1087,20 @@ class LoaderMod(loader.Module): status = status.split("")[0] errors.append( - f"{module} — {status}\n" + f"{module} — {status}" ) + else: success.append(f"{module}") - msg = self.strings["modules_unloaded"].format( - unloaded = len(args.split("\n")) - len(errors), - not_unloaded = len(errors), - errors="".join(errors) if errors else "", - ) + if success: + msg += self.strings["modules_unloaded"].format( + unloaded_num = len(success), + unloaded=", ".join(success) + ) + if errors: + msg += ("\n" + self.strings["modules_not_unloaded"].format( + not_unloaded = len(errors), + errors="\n".join(errors), + )) await utils.answer(message, msg)