From 3cbe45e24355396645b9a721fdca6d5116bd1c36 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 4 May 2025 15:11:11 +0200 Subject: fix live log --- logic/Cargo.toml | 1 + logic/src/admin/log.rs | 4 ++-- logic/src/admin/mod.rs | 14 +++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'logic') diff --git a/logic/Cargo.toml b/logic/Cargo.toml index 23016f9..fd70b73 100644 --- a/logic/Cargo.toml +++ b/logic/Cargo.toml @@ -5,6 +5,7 @@ edition = "2024" [dependencies] jellyimport-asset-token = { path = "../import/asset_token" } +jellyimport = { path = "../import" } jellycommon = { path = "../common" } jellydb = { path = "../database" } log = "0.4.27" diff --git a/logic/src/admin/log.rs b/logic/src/admin/log.rs index 64d23ca..7130c45 100644 --- a/logic/src/admin/log.rs +++ b/logic/src/admin/log.rs @@ -44,9 +44,9 @@ pub fn get_log_buffer(warn: bool) -> VecDeque> { } pub fn get_log_stream(warn: bool) -> broadcast::Receiver> { if warn { - LOGGER.stream.0.subscribe() - } else { LOGGER.stream.1.subscribe() + } else { + LOGGER.stream.0.subscribe() } } diff --git a/logic/src/admin/mod.rs b/logic/src/admin/mod.rs index 270a732..2545ba4 100644 --- a/logic/src/admin/mod.rs +++ b/logic/src/admin/mod.rs @@ -4,5 +4,17 @@ Copyright (C) 2025 metamuffin */ -pub mod user; pub mod log; +pub mod user; + +use crate::session::AdminSession; +use anyhow::Result; +use jellydb::Database; +use jellyimport::IMPORT_ERRORS; + +pub async fn get_import_errors(_session: &AdminSession) -> Vec { + IMPORT_ERRORS.read().await.to_owned() +} +pub fn list_invites(_session: &AdminSession, database: &Database) -> Result> { + database.list_invites() +} -- cgit v1.2.3-70-g09d2