Kieran/route96
1
0
Fork 0
mirror of https://github.com/v0l/route96.git synced 2025-06-22 13:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: mime like
Some checks reported errors
continuous-integration/drone Build was killed
Details
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Kieran
2025-06-17 11:56:00 +01:00
parent b6c12de685
commit 455970b9fe
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/routes/admin.rs
View File

@ -1,5 +1,5 @@
use crate::auth::nip98::Nip98Auth; use crate::auth::nip98::Nip98Auth;
use crate::db::{Database, FileUpload, User, Report}; use crate::db::{Database, FileUpload, Report, User};
use crate::routes::{Nip94Event, PagedResult}; use crate::routes::{Nip94Event, PagedResult};
use crate::settings::Settings; use crate::settings::Settings;
use rocket::serde::json::Json; use rocket::serde::json::Json;
@ -8,7 +8,12 @@ use rocket::{routes, Responder, Route, State};
use sqlx::{Error, QueryBuilder, Row}; use sqlx::{Error, QueryBuilder, Row};
pub fn admin_routes() -> Vec<Route> { pub fn admin_routes() -> Vec<Route> {
routes![admin_list_files, admin_get_self, admin_list_reports, admin_acknowledge_report] routes![
admin_list_files,
admin_get_self,
admin_list_reports,
admin_acknowledge_report
]
} }
#[derive(Serialize, Default)] #[derive(Serialize, Default)]
@ -71,7 +76,11 @@ pub struct AdminNip94File {
} }
#[rocket::get("/self")] #[rocket::get("/self")]
async fn admin_get_self(auth: Nip98Auth, db: &State<Database>, settings: &State<Settings>) -> AdminResponse<SelfUser> { async fn admin_get_self(
auth: Nip98Auth,
db: &State<Database>,
settings: &State<Settings>,
) -> AdminResponse<SelfUser> {
let pubkey_vec = auth.event.pubkey.to_bytes().to_vec(); let pubkey_vec = auth.event.pubkey.to_bytes().to_vec();
match db.get_user(&pubkey_vec).await { match db.get_user(&pubkey_vec).await {
Ok(user) => { Ok(user) => {
@ -84,18 +93,20 @@ async fn admin_get_self(auth: Nip98Auth, db: &State<Database>, settings: &State<
#[cfg(feature = "payments")] #[cfg(feature = "payments")]
let (free_quota, total_available_quota) = { let (free_quota, total_available_quota) = {
let free_quota = settings.payments.as_ref() let free_quota = settings
.payments
.as_ref()
.and_then(|p| p.free_quota_bytes) .and_then(|p| p.free_quota_bytes)
.unwrap_or(104857600); .unwrap_or(104857600);
let mut total_available = free_quota; let mut total_available = free_quota;
// Add paid quota if still valid // Add paid quota if still valid
if let Some(paid_until) = &user.paid_until { if let Some(paid_until) = &user.paid_until {
if *paid_until > chrono::Utc::now() { if *paid_until > chrono::Utc::now() {
total_available += user.paid_size; total_available += user.paid_size;
} }
} }
(free_quota, total_available) (free_quota, total_available)
}; };
@ -223,7 +234,7 @@ impl Database {
) -> Result<(Vec<(FileUpload, Vec<User>)>, i64), Error> { ) -> Result<(Vec<(FileUpload, Vec<User>)>, i64), Error> {
let mut q = QueryBuilder::new("select u.* from uploads u "); let mut q = QueryBuilder::new("select u.* from uploads u ");
if let Some(m) = mime_type { if let Some(m) = mime_type {
q.push("where u.mime_type = "); q.push("where u.mime_type like ");
q.push_bind(m); q.push_bind(m);
} }
q.push(" order by u.created desc limit "); q.push(" order by u.created desc limit ");