oxen-io/session-open-group-server
1
0
Fork 0
mirror of https://github.com/oxen-io/session-open-group-server.git synced 2023-12-13 20:30:35 +01:00
Code Issues Projects Releases Wiki Activity

Minor refactoring

Browse source
This commit is contained in:
nielsandriesse 2021-03-10 14:25:20 +11:00
parent cfda345750
commit 74b668f2fd
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.rs
View file

@ -1,5 +1,3 @@
use warp::Filter;
mod handlers;
mod models;
mod routes;
@ -12,9 +10,6 @@ async fn main() {
let db_conn = storage::get_db_conn(&db_pool).unwrap(); // Force
storage::create_table_if_needed(&db_conn);
// Routes
let send_message = routes::send_message(db_pool.clone());
let get_messages = routes::get_messages(db_pool.clone());
let delete_message = routes::delete_message(db_pool.clone());
let routes = send_message.or(get_messages).or(delete_message);
let routes = routes::get_all(&db_pool);
warp::serve(routes).run(([127, 0, 0, 1], 3030)).await;
}

14
src/routes.rs
View file

@ -4,9 +4,17 @@ use super::handlers;
use super::models;
use super::storage;
pub fn get_all(
db_pool: &storage::DatabaseConnectionPool
) -> impl Filter<Extract = impl warp::Reply, Error = Rejection> + Clone {
return send_message(db_pool.clone())
.or(get_messages(db_pool.clone()))
.or(delete_message(db_pool.clone()));
}
/// POST /messages
pub fn send_message(
db_pool: storage::DatabaseConnectionPool,
db_pool: storage::DatabaseConnectionPool
) -> impl Filter<Extract = impl warp::Reply, Error = Rejection> + Clone {
return warp::post()
.and(warp::path("messages"))
@ -21,7 +29,7 @@ pub fn send_message(
///
/// Returns the last `count` messages.
pub fn get_messages(
db_pool: storage::DatabaseConnectionPool,
db_pool: storage::DatabaseConnectionPool
) -> impl Filter<Extract = impl warp::Reply, Error = Rejection> + Clone {
return warp::get()
.and(warp::path("messages"))
@ -33,7 +41,7 @@ pub fn get_messages(
/// DELETE /messages/:id
pub fn delete_message(
db_pool: storage::DatabaseConnectionPool,
db_pool: storage::DatabaseConnectionPool
) -> impl Filter<Extract = impl warp::Reply, Error = Rejection> + Clone {
return warp::delete()
.and(warp::path!("messages" / i64))