news_range: show date range instead of single day link in footer

parent dda07970
...@@ -151,8 +151,9 @@ async def news_range_handler( ...@@ -151,8 +151,9 @@ async def news_range_handler(
await m.answer("Новостей за этот период не найдено.") await m.answer("Новостей за этот период не найдено.")
return return
date_range = f"{d_from.strftime('%d.%m.%Y')} — {d_to.strftime('%d.%m.%Y')}"
added, removed, updated, info_message = await format_packages( added, removed, updated, info_message = await format_packages(
packages_data, "sisyphus" packages_data, "sisyphus", date_range=date_range
) )
chat_id = m.from_user.id chat_id = m.from_user.id
......
...@@ -8,7 +8,7 @@ from altrepo.parser.models import PackagesModel, RemovedPackageElementModel ...@@ -8,7 +8,7 @@ from altrepo.parser.models import PackagesModel, RemovedPackageElementModel
from config import PACKAGES_URL from config import PACKAGES_URL
from services.utils import translate_package, translate_maintainer, chunk_list from services.utils import translate_package, translate_maintainer, chunk_list
async def format_packages(packages: PackagesModel, news_type: str, translate: bool = False): async def format_packages(packages: PackagesModel, news_type: str, translate: bool = False, date_range: str | None = None):
repo = PACKAGES_URL.format(repo=news_type) repo = PACKAGES_URL.format(repo=news_type)
added_messages = [] added_messages = []
...@@ -24,10 +24,14 @@ async def format_packages(packages: PackagesModel, news_type: str, translate: bo ...@@ -24,10 +24,14 @@ async def format_packages(packages: PackagesModel, news_type: str, translate: bo
if packages.updated: if packages.updated:
updated_messages = await _format_package_group(packages, repo, translate, "updated") updated_messages = await _format_package_group(packages, repo, translate, "updated")
if date_range:
source = f"sisyphus-cybertalk за {date_range}"
else:
source = HTMLFormatter(link(packages.url, text="sisyphus-cybertalk"))
info_message = ( info_message = (
f"Всего исходных пакетов: {packages.total}\n\n" f"Всего исходных пакетов: {packages.total}\n\n"
"Источник: " + f"Источник: {source}"
HTMLFormatter(link(packages.url, text="sisyphus-cybertalk")) +
"\n\n" "\n\n"
"Сформировано при помощи " + "Сформировано при помощи " +
HTMLFormatter(bold(link("https://t.me/altlinux_packages_bot", text="ALT Packages Bot"))) HTMLFormatter(bold(link("https://t.me/altlinux_packages_bot", text="ALT Packages Bot")))
......
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