Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
7873f33d23
9 changed files with 177 additions and 31 deletions
|
|
@ -428,7 +428,7 @@ pub async fn run_command(command: &str) {
|
|||
{
|
||||
log!("Created user {}", user.user_id);
|
||||
} else {
|
||||
log!("Failed to create user");
|
||||
log!("User creation: Failed to create user. See errors above.");
|
||||
}
|
||||
}
|
||||
["user", "remove", username] => {
|
||||
|
|
@ -436,7 +436,7 @@ pub async fn run_command(command: &str) {
|
|||
user_manager::remove_user(user.user_id);
|
||||
log!("Removed user {}", user.user_id);
|
||||
} else {
|
||||
log!("Failed to find user");
|
||||
log!("User removal: Username doesn't exist");
|
||||
}
|
||||
}
|
||||
["user", "list"] => {
|
||||
|
|
@ -457,7 +457,7 @@ pub async fn run_command(command: &str) {
|
|||
user_manager::remove_user(user.user_id);
|
||||
log!("Removed user {}", user.user_id);
|
||||
} else {
|
||||
log!("Failed to find user");
|
||||
log!("User info: Username doesn't exist");
|
||||
}
|
||||
}
|
||||
["reload"] | ["restart"] => {
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ pub enum UserChoice {
|
|||
AcceptAll,
|
||||
}
|
||||
|
||||
#[allow(dead_code)] // ui is unused
|
||||
pub struct TermsCheckerScreen {
|
||||
_ui: Arc<UI>,
|
||||
sender: Option<oneshot::Sender<UserChoice>>,
|
||||
|
|
|
|||
|
|
@ -9,10 +9,7 @@ use ratatui::{Terminal, backend::CrosstermBackend, init};
|
|||
use std::{
|
||||
collections::VecDeque,
|
||||
io::Stdout,
|
||||
sync::{
|
||||
Arc, Mutex,
|
||||
atomic::{AtomicBool, Ordering},
|
||||
},
|
||||
sync::{Arc, Mutex, atomic::Ordering},
|
||||
time::Duration,
|
||||
};
|
||||
use tokio::{sync::RwLock, time::Instant};
|
||||
|
|
|
|||
Loading…
Reference in a new issue