HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

refactor (backend-rs): provide DbConn as an argument of user::count::local_total

Browse source
This commit is contained in:
naskya 2024-07-11 02:41:23 +09:00
parent ca6b840302
commit 85a1db7981
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend-rs/src/federation/nodeinfo/generate.rs
View file

@ -34,7 +34,7 @@ async fn statistics() -> Result<(u64, u64, u64, u64), DbErr> {
const MONTH: chrono::TimeDelta = chrono::Duration::days(30); const MONTH: chrono::TimeDelta = chrono::Duration::days(30);
const HALF_YEAR: chrono::TimeDelta = chrono::Duration::days(183); const HALF_YEAR: chrono::TimeDelta = chrono::Duration::days(183);
let local_users = misc::user::count::local_total(); let local_users = misc::user::count::local_total(db);
let local_active_halfyear = user::Entity::find() let local_active_halfyear = user::Entity::find()
.filter(user::Column::Host.is_null()) .filter(user::Column::Host.is_null())
.filter(user::Column::LastActiveDate.gt(now - HALF_YEAR)) .filter(user::Column::LastActiveDate.gt(now - HALF_YEAR))

10
packages/backend-rs/src/misc/user/count.rs
View file

@ -1,4 +1,4 @@
use crate::{database::db_conn, model::entity::user}; use crate::model::entity::user;
use sea_orm::prelude::*; use sea_orm::prelude::*;
// TODO: When `std::mem::variant_count` is stabilized, use // TODO: When `std::mem::variant_count` is stabilized, use
@ -7,15 +7,17 @@ use sea_orm::prelude::*;
// @instance.actor and @relay.actor are not real users // @instance.actor and @relay.actor are not real users
const NUMBER_OF_SYSTEM_ACTORS: u64 = 2; const NUMBER_OF_SYSTEM_ACTORS: u64 = 2;
pub async fn local_total() -> Result<u64, DbErr> { pub async fn local_total(db: &DbConn) -> Result<u64, DbErr> {
user::Entity::find() user::Entity::find()
.filter(user::Column::Host.is_null()) .filter(user::Column::Host.is_null())
.count(db_conn().await?) .count(db)
.await .await
.map(|count| count - NUMBER_OF_SYSTEM_ACTORS) .map(|count| count - NUMBER_OF_SYSTEM_ACTORS)
} }
#[macros::ts_export(js_name = "countLocalUsers")] #[macros::ts_export(js_name = "countLocalUsers")]
pub async fn local_total_js() -> Result<u32, DbErr> { pub async fn local_total_js() -> Result<u32, DbErr> {
local_total().await.map(|count| count as u32) local_total(crate::database::db_conn().await?)
.await
.map(|count| count as u32)
} }