mirror of
https://github.com/house-of-vanity/OutFleet.git
synced 2025-10-26 10:09:08 +00:00
Improve CI and lint code
This commit is contained in:
@@ -249,7 +249,7 @@ pub async fn handle_approve_request(
|
||||
};
|
||||
|
||||
match user_repo.create(dto).await {
|
||||
Ok(new_user) => {
|
||||
Ok(_new_user) => {
|
||||
// Approve the request
|
||||
request_repo
|
||||
.approve(
|
||||
@@ -297,9 +297,9 @@ pub async fn handle_approve_request(
|
||||
}
|
||||
|
||||
// Send main menu to the user instead of just notification
|
||||
let user_lang = Language::from_telegram_code(Some(&request.get_language()));
|
||||
let _user_lang = Language::from_telegram_code(Some(&request.get_language()));
|
||||
let user_repo_for_user = UserRepository::new(db.connection());
|
||||
let is_admin = false; // New users are not admins by default
|
||||
let _is_admin = false; // New users are not admins by default
|
||||
|
||||
// Create a fake user object for language detection
|
||||
let fake_user = teloxide::types::User {
|
||||
@@ -633,7 +633,7 @@ pub async fn handle_select_server_access(
|
||||
short_request_id: &str,
|
||||
db: &DatabaseManager,
|
||||
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||
let lang = Language::English; // Default admin language
|
||||
let _lang = Language::English; // Default admin language
|
||||
let _l10n = LocalizationService::new();
|
||||
let chat_id = q
|
||||
.message
|
||||
@@ -815,7 +815,7 @@ pub async fn handle_apply_server_access(
|
||||
short_request_id: &str,
|
||||
db: &DatabaseManager,
|
||||
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||
let lang = Language::English; // Default admin language
|
||||
let _lang = Language::English; // Default admin language
|
||||
let _l10n = LocalizationService::new();
|
||||
let chat_id = q
|
||||
.message
|
||||
@@ -1177,7 +1177,7 @@ pub async fn handle_user_details(
|
||||
|
||||
// Build keyboard
|
||||
let short_user_id = generate_short_user_id(&user_id.to_string());
|
||||
let mut keyboard_buttons = vec![
|
||||
let keyboard_buttons = vec![
|
||||
vec![InlineKeyboardButton::callback(
|
||||
l10n.get(lang.clone(), "manage_access"),
|
||||
format!("user_manage:{}", short_user_id),
|
||||
|
||||
@@ -17,7 +17,7 @@ pub async fn handle_command(
|
||||
msg: Message,
|
||||
cmd: Command,
|
||||
db: DatabaseManager,
|
||||
app_config: AppConfig,
|
||||
_app_config: AppConfig,
|
||||
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||
let chat_id = msg.chat.id;
|
||||
let from = &msg.from.ok_or("No user info")?;
|
||||
|
||||
@@ -289,21 +289,3 @@ pub fn get_new_user_keyboard(lang: Language) -> InlineKeyboardMarkup {
|
||||
)]])
|
||||
}
|
||||
|
||||
/// Restore UUID from compact format (without dashes)
|
||||
fn restore_uuid(compact: &str) -> Option<String> {
|
||||
if compact.len() != 32 {
|
||||
return None;
|
||||
}
|
||||
|
||||
// Insert dashes at proper positions for UUID format
|
||||
let uuid_str = format!(
|
||||
"{}-{}-{}-{}-{}",
|
||||
&compact[0..8],
|
||||
&compact[8..12],
|
||||
&compact[12..16],
|
||||
&compact[16..20],
|
||||
&compact[20..32]
|
||||
);
|
||||
|
||||
Some(uuid_str)
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ use teloxide::{
|
||||
|
||||
use super::super::localization::{Language, LocalizationService};
|
||||
use super::types::{get_main_keyboard, get_new_user_keyboard, get_user_language};
|
||||
use crate::database::entities::user_request::{CreateUserRequestDto, RequestStatus};
|
||||
use crate::database::entities::user_request::CreateUserRequestDto;
|
||||
use crate::database::repository::{UserRepository, UserRequestRepository};
|
||||
use crate::database::DatabaseManager;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user