Skip to content

Commit 699511d

Browse files
committed
refactor(imports): add prelude for easiest imports
1 parent b02ee87 commit 699511d

102 files changed

Lines changed: 314 additions & 176 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

rustmail/src/api/handler/auth/callback.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::BotState;
1+
use crate::types::bot::BotState;
22
use axum::extract::{Query, State};
33
use axum::response::Redirect;
44
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};

rustmail/src/api/handler/auth/login.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::BotState;
21
use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
2+
use crate::types::bot::BotState;
33
use axum::extract::{Query, State};
44
use axum::response::Redirect;
55
use axum_extra::extract::CookieJar;
6-
use sqlx::{Row, query};
6+
use sqlx::{query, Row};
77
use std::collections::HashMap;
88
use std::sync::Arc;
99
use tokio::sync::Mutex;

rustmail/src/api/handler/auth/logout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::BotState;
21
use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
2+
use crate::types::bot::BotState;
33
use axum::extract::State;
44
use axum::response::Redirect;
55
use axum_extra::extract::CookieJar;

rustmail/src/api/handler/bot/restart.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::api::utils::ping_internal::ping_internal;
2-
use crate::{BotState, BotStatus};
3-
use axum::Json;
2+
use crate::types::bot::{BotState, BotStatus};
43
use axum::extract::State;
54
use axum::http::StatusCode;
5+
use axum::Json;
66
use sqlx::__rt::sleep;
77
use std::sync::Arc;
88
use std::time::Duration;

rustmail/src/api/handler/bot/start.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::bot::run_bot;
22
use crate::config::load_config;
3-
use crate::{BotState, BotStatus};
4-
use axum::Json;
3+
use crate::types::bot::{BotState, BotStatus};
54
use axum::extract::State;
65
use axum::http::StatusCode;
6+
use axum::Json;
77
use std::sync::Arc;
88
use tokio::spawn;
99
use tokio::sync::Mutex;

rustmail/src/api/handler/bot/status.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
use crate::BotState;
2-
use axum::Json;
1+
use crate::types::bot::{BotState, BotStatus};
32
use axum::extract::State;
43
use axum::http::StatusCode;
54
use axum::response::IntoResponse;
5+
use axum::Json;
66
use std::sync::Arc;
77
use tokio::sync::Mutex;
88

99
pub async fn handle_status_bot(State(bot_state): State<Arc<Mutex<BotState>>>) -> impl IntoResponse {
1010
let state_lock = bot_state.lock().await;
1111

1212
match state_lock.status {
13-
crate::BotStatus::Running { .. } => (
13+
BotStatus::Running { .. } => (
1414
StatusCode::OK,
1515
Json(serde_json::json!({"status": "running"})),
1616
),
17-
crate::BotStatus::Stopped => (
17+
BotStatus::Stopped => (
1818
StatusCode::OK,
1919
Json(serde_json::json!({"status": "stopped"})),
2020
),

rustmail/src/api/handler/bot/stop.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use crate::{BotState, BotStatus};
2-
use axum::Json;
1+
use crate::types::bot::{BotState, BotStatus};
32
use axum::extract::State;
43
use axum::http::StatusCode;
4+
use axum::Json;
55
use std::sync::Arc;
66
use tokio::sync::Mutex;
77

rustmail/src/api/handler/bot/tickets.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use crate::BotState;
1+
use crate::types::bot::BotState;
22
use axum::{
3-
Json,
43
extract::{Query, State},
54
http::StatusCode,
5+
Json,
66
};
77
use serde::{Deserialize, Serialize};
88
use std::sync::Arc;

rustmail/src/api/handler/panel/panel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::BotState;
1+
use crate::types::bot::BotState;
22
use axum::extract::State;
33
use axum::response::IntoResponse;
44
use std::sync::Arc;

rustmail/src/api/handler/user/avatar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::BotState;
21
use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
2+
use crate::types::bot::BotState;
33
use axum::extract::State;
44
use axum::response::IntoResponse;
55
use axum_extra::extract::CookieJar;

0 commit comments

Comments
 (0)