news.packages: fix package url

parent e70b5c16
......@@ -79,7 +79,7 @@ async def news_handler(
try:
added, removed, updated, info_message = await format_packages(
packages_data, bool(translate)
packages_data, news_type, bool(translate)
)
except:
await m.ctx_api.send_message(
......
......@@ -8,24 +8,21 @@ from altrepo.parser.models import PackagesModel, RemovedPackageElementModel
from config import PACKAGES_URL
from services.utils import translate_package, translate_maintainer, chunk_list
repo = PACKAGES_URL.format(repo="sisyphus")
async def format_packages(packages: PackagesModel, translate: bool = False):
async def format_packages(packages: PackagesModel, news_type: str, translate: bool = False):
repo = PACKAGES_URL.format(repo=news_type)
added_messages = []
removed_message = ""
updated_messages = []
if packages.added:
added_messages = await _format_package_group(packages, translate, "added")
added_messages = await _format_package_group(packages, repo, translate, "added")
if packages.removed:
removed_message = await _format_removed(packages)
removed_message = await _format_removed(packages, repo)
if packages.updated:
updated_messages = await _format_package_group(packages, translate, "updated")
updated_messages = await _format_package_group(packages, repo, translate, "updated")
info_message = (
f"Всего исходных пакетов: {packages.total}\n\n"
......@@ -39,7 +36,7 @@ async def format_packages(packages: PackagesModel, translate: bool = False):
return added_messages, removed_message, updated_messages, info_message
async def _format_removed(packages_model: PackagesModel) -> str:
async def _format_removed(packages_model: PackagesModel, repo: str) -> str:
removed = packages_model.removed
lines = [f"Удалены: {len(removed)}"]
for pkg in removed:
......@@ -48,7 +45,7 @@ async def _format_removed(packages_model: PackagesModel) -> str:
return "\n".join(lines) + "\n"
async def _format_package_group(packages_model: PackagesModel, translate: bool, pkg_type: str):
async def _format_package_group(packages_model: PackagesModel, repo: str, translate: bool, pkg_type: str):
pkg_types = {
"added": (packages_model.added or [], "Добавлено"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment