diff --git a/server-api/src/db_types.rs b/server-api/src/db_types.rs deleted file mode 100644 index 4969457..0000000 --- a/server-api/src/db_types.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub type Integer = i32; - -pub type UBigInt = u64; -pub type BigInt = i64; - -pub type VarChar = String; - diff --git a/server-api/src/invites.rs b/server-api/src/invites.rs index 9236ff1..846b7ad 100644 --- a/server-api/src/invites.rs +++ b/server-api/src/invites.rs @@ -10,7 +10,7 @@ use hyper::{Response, Body, StatusCode}; use chrono::Utc; -use crate::db_types::{UBigInt, BigInt}; +use db::{UBigInt, BigInt}; use crate::members::{self, Member}; #[derive(Serialize)] diff --git a/server-api/src/main.rs b/server-api/src/main.rs index bdc905a..58de189 100644 --- a/server-api/src/main.rs +++ b/server-api/src/main.rs @@ -35,7 +35,6 @@ mod messages; mod admin; mod http_params; -mod db_types; mod testing; const NO_ERR: u16 = 0; diff --git a/server-api/src/members.rs b/server-api/src/members.rs index 4103c1b..6dd2302 100644 --- a/server-api/src/members.rs +++ b/server-api/src/members.rs @@ -5,7 +5,7 @@ use mysql_async::prelude::{params, Queryable}; use serde::Serialize; use db::{UBigInt, BigInt, Integer, VarChar}; -use db::member::{STATUS_ONLINE, STATUS_OFFLINE}; +use db::member::STATUS_ONLINE; use crate::auth; #[derive(Serialize)] diff --git a/server-api/src/messages.rs b/server-api/src/messages.rs index ffe0f6f..220f6df 100644 --- a/server-api/src/messages.rs +++ b/server-api/src/messages.rs @@ -7,7 +7,7 @@ use hyper::{Response, Body, StatusCode}; use serde_json::Value; use chrono::Utc; -use crate::db_types::{UBigInt}; +use db::UBigInt; pub async fn insert_message(pool: &Pool, content: &Value, channel_name: &Value, author_id: UBigInt)