aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin J Hoerr <kjhoerr@submelon.tech>2019-10-30 09:40:39 -0400
committerKevin J Hoerr <kjhoerr@submelon.tech>2019-10-30 09:40:39 -0400
commitb3a313f8e5e0185104727e75747251121eddf92d (patch)
tree7619d8d14d99767803658e62c21792136d7a1ada /src
parent067e9784b54e4645412e5e7d8d7d2bc70bdcf646 (diff)
downloadaugust-offensive-b3a313f8e5e0185104727e75747251121eddf92d.tar.gz
august-offensive-b3a313f8e5e0185104727e75747251121eddf92d.tar.bz2
august-offensive-b3a313f8e5e0185104727e75747251121eddf92d.zip
Refactor messages module to be separate from routes and easily referencable
Diffstat (limited to 'src')
-rw-r--r--src/main.rs1
-rw-r--r--src/messages/callback.rs (renamed from src/routes/messages/callback.rs)0
-rw-r--r--src/messages/mod.rs (renamed from src/routes/messages/mod.rs)3
-rw-r--r--src/messages/not_understood.rs (renamed from src/routes/messages/not_understood.rs)0
-rw-r--r--src/routes/mod.rs4
5 files changed, 5 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs
index c0fbf13..1b5ac70 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,7 @@ extern crate serde;
#[macro_use]
extern crate serde_derive;
+pub mod messages;
pub mod routes;
pub mod schema;
diff --git a/src/routes/messages/callback.rs b/src/messages/callback.rs
index d98ac15..d98ac15 100644
--- a/src/routes/messages/callback.rs
+++ b/src/messages/callback.rs
diff --git a/src/routes/messages/mod.rs b/src/messages/mod.rs
index 26ae1bb..ca74078 100644
--- a/src/routes/messages/mod.rs
+++ b/src/messages/mod.rs
@@ -3,6 +3,9 @@ use std::marker::Sized;
pub mod callback;
pub mod not_understood;
+pub use self::callback::Callback;
+pub use self::not_understood::NotUnderstood;
+
#[derive(Serialize)]
pub struct OutgoingMsg<T> {
pub result_type: String,
diff --git a/src/routes/messages/not_understood.rs b/src/messages/not_understood.rs
index 6c2c3ae..6c2c3ae 100644
--- a/src/routes/messages/not_understood.rs
+++ b/src/messages/not_understood.rs
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 4a8ed5a..6039f44 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -1,9 +1,7 @@
use actix_web::{web::Json, web::Query, HttpRequest, Result};
+use messages::*;
use std::collections::HashMap;
-pub mod messages;
-use messages::{callback::*, not_understood::*, *};
-
type JsonMessage<U> = Result<Json<OutgoingMsg<U>>>;
// Sends a default response message when requested an undefined resource.