Temporarily hardcode ~tildes.official as the main user count.

With the new groups being added some of them have more subscribers
than ~tildes.official which is making the homepage chart only have
3 datapoints (as of today).

I want to revert get_highest_subscribers back but add a check so
it gets the group with the highest subscribers and a certain amount
of rows. But I have yet to figure out how to do that.
This commit is contained in:
Bauke 2023-07-10 18:20:22 +02:00
parent 7b2c77b2d9
commit 7fb951ff7b
Signed by: Bauke
GPG Key ID: C1C0F29952BCF558
3 changed files with 5 additions and 4 deletions

View File

@ -102,7 +102,7 @@ pub async fn run() -> Result<()> {
if let Some(snapshot) = SnapshotModel::get_most_recent(&db).await? { if let Some(snapshot) = SnapshotModel::get_most_recent(&db).await? {
( (
GroupDataModel::get_all_by_snapshot(&db, &snapshot).await?, GroupDataModel::get_all_by_snapshot(&db, &snapshot).await?,
GroupDataModel::get_highest_subscribers(&db, &snapshot).await?, GroupDataModel::get_tildes_official_data(&db, &snapshot).await?,
) )
} else { } else {
(vec![], None) (vec![], None)

View File

@ -28,14 +28,15 @@ impl GroupDataModel {
Ok(groups) Ok(groups)
} }
/// Get the group with the highest subscriber count from a given snapshot. /// Get the group data for ~tildes.official.
pub async fn get_highest_subscribers( pub async fn get_tildes_official_data(
db: &DatabaseConnection, db: &DatabaseConnection,
snapshot: &SnapshotModel, snapshot: &SnapshotModel,
) -> Result<Option<Self>> { ) -> Result<Option<Self>> {
let group = snapshot let group = snapshot
.find_related(GroupDataEntity) .find_related(GroupDataEntity)
.order_by_desc(GroupDataColumn::Subscribers) .order_by_desc(GroupDataColumn::Subscribers)
.filter(GroupDataColumn::Name.eq("~tildes.official"))
.one(db) .one(db)
.await?; .await?;

View File

@ -46,7 +46,7 @@
</td> </td>
<td> <td>
{{ group.subscribers }}&nbsp;<span class="small" {{ group.subscribers }}&nbsp;<span class="small"
title="Percentage of subscribers compared to the highest-subscribed group." title="Percentage of subscribers compared to ~tildes.official."
>({{ group.subscribers|percentage(user_count) }})</span> >({{ group.subscribers|percentage(user_count) }})</span>
</td> </td>
<td> <td>