refactor: is_paid→is_member, paid_expires_at→membership_expires_at 全局重命名

This commit is contained in:
2026-05-25 15:33:31 +08:00
parent 94ad9ba190
commit 722ab837d0
7 changed files with 116 additions and 98 deletions

View File

@@ -17,11 +17,11 @@ pub async fn get_current_user_profile(
let user = db::get_user_by_id(pool.get_ref(), user_id).await?;
let is_maintenance = std::env::var("PAYMENT_MAINTENANCE_MODE").ok() == Some("true".to_string());
let is_paid_active = if is_maintenance {
let is_active_member = if is_maintenance {
true
} else {
user.is_paid &&
user.paid_expires_at.map_or(true, |expires| expires > chrono::Utc::now())
user.is_member &&
user.membership_expires_at.map_or(true, |expires| expires > chrono::Utc::now())
};
Ok(HttpResponse::Ok().json(serde_json::json!({
@@ -31,10 +31,10 @@ pub async fn get_current_user_profile(
"name": user.name,
"nickname": user.nickname,
"avatarUrl": user.avatar_url,
"is_paid": user.is_paid,
"is_paid_active": is_paid_active,
"is_member": user.is_member,
"is_active_member": is_active_member,
"is_admin": user.is_admin,
"paid_expires_at": user.paid_expires_at
"membership_expires_at": user.membership_expires_at
}
})))
}