Skip to content

Added new projects to daily stats #1904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added new projects to daily stats #1904

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cae1b4
Added new projects to daily stats
djamg Oct 17, 2023
35dc1de
Merge branch 'main' into dailystats-update
djamg Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion funnel/cli/periodic/stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,18 @@ async def user_stats() -> dict[str, ResourceStats]:
return stats


async def projects_stats() -> list[models.Project]:
"""Fetch all the projects that have been created in the last 24 hours."""

tz = pytz.timezone(app.config['TIMEZONE'])
now = utcnow().astimezone(tz)
today = midnight_to_utc(now)
new_projects = models.Project.query.filter(
models.Project.created_at >= today,
).all()
return new_projects


# --- Commands -------------------------------------------------------------------------


Expand All @@ -384,7 +396,9 @@ async def dailystats() -> None:
now = utcnow().astimezone(tz)
display_date = now - relativedelta(days=1)

user_data, matomo_data = await asyncio.gather(user_stats(), matomo_stats())
user_data, matomo_data, project_data = await asyncio.gather(
user_stats(), matomo_stats(), projects_stats()
)
message = (
f"*Traffic #statistics for {display_date.strftime('%a, %-d %b %Y')}*\n"
f"\n"
Expand Down Expand Up @@ -447,6 +461,11 @@ async def dailystats() -> None:
for mdata in matomo_data.socials:
message += f"{mdata.nb_visits}: {mdata.label.strip()}\n"

if project_data:
message += "\n*New projects:*\n"
for project in project_data:
message += f"→ [{project.joined_title}]({project.url_for()})\n"

bot = telegram.Bot(app.config["TELEGRAM_STATS_APIKEY"])
await bot.send_message(
text=message,
Expand Down