Skip to content

Commit 0ac7ac0

Browse files
authored
Merge pull request #225 from Rustmail/223-refactor-imports
refactor(imports): add prelude for easiest imports
2 parents 00a1d6e + b70943a commit 0ac7ac0

209 files changed

Lines changed: 937 additions & 914 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::prelude::types::*;
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,5 +1,5 @@
1-
use crate::BotState;
2-
use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
1+
use crate::prelude::api::*;
2+
use crate::prelude::types::*;
33
use axum::extract::{Query, State};
44
use axum::response::Redirect;
55
use axum_extra::extract::CookieJar;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::BotState;
2-
use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
1+
use crate::prelude::api::*;
2+
use crate::prelude::types::*;
33
use axum::extract::State;
44
use axum::response::Redirect;
55
use axum_extra::extract::CookieJar;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
pub mod callback;
22
pub mod login;
33
pub mod logout;
4+
5+
pub use callback::*;
6+
pub use login::*;
7+
pub use logout::*;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ pub mod start;
33
pub mod status;
44
pub mod stop;
55
pub mod tickets;
6+
7+
pub use restart::*;
8+
pub use start::*;
9+
pub use status::*;
10+
pub use stop::*;
11+
pub use tickets::*;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::api::utils::ping_internal::ping_internal;
2-
use crate::{BotState, BotStatus};
1+
use crate::prelude::api::*;
2+
use crate::prelude::types::*;
33
use axum::Json;
44
use axum::extract::State;
55
use axum::http::StatusCode;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::bot::run_bot;
2-
use crate::config::load_config;
3-
use crate::{BotState, BotStatus};
2+
use crate::prelude::config::*;
3+
use crate::prelude::types::*;
44
use axum::Json;
55
use axum::extract::State;
66
use axum::http::StatusCode;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::BotState;
1+
use crate::prelude::types::*;
22
use axum::Json;
33
use axum::extract::State;
44
use axum::http::StatusCode;
@@ -10,11 +10,11 @@ pub async fn handle_status_bot(State(bot_state): State<Arc<Mutex<BotState>>>) ->
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{BotState, BotStatus};
1+
use crate::prelude::types::*;
22
use axum::Json;
33
use axum::extract::State;
44
use axum::http::StatusCode;

rustmail/src/api/handler/bot/tickets.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::prelude::types::*;
22
use axum::{
33
Json,
44
extract::{Query, State},

0 commit comments

Comments
 (0)