From 4fb3dc1c9d6b74df77a4d56d826b8842481bb377 Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@protonmail.com>
Date: Fri, 31 Aug 2018 19:47:09 -0400
Subject: Implement NotUnderstood message; Wrap messages with OutgoingMsg

---
 src/routes/messages.rs | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'src/routes/messages.rs')

diff --git a/src/routes/messages.rs b/src/routes/messages.rs
index c4f2b5e..7b7a70b 100644
--- a/src/routes/messages.rs
+++ b/src/routes/messages.rs
@@ -1,15 +1,29 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, marker::Sized};
 
-trait Content {}
+#[derive(Serialize)]
+pub struct OutgoingMsg<T> {
+    pub result_type: String,
+    pub content: T,
+}
 
-trait Message {
+pub trait Message {
     fn name(&self) -> String;
+    fn as_outgoing(self) -> OutgoingMsg<Self>
+    where
+        Self: Sized,
+    {
+        OutgoingMsg {
+            result_type: self.name(),
+            content: self,
+        }
+    }
 }
 
 #[derive(Serialize)]
 pub struct Callback {
     pub path: Vec<String>,
-    pub request: HashMap<String, String>,
+    pub request: String,
+    pub content: HashMap<String, String>,
 }
 
 impl Message for Callback {
@@ -17,3 +31,14 @@ impl Message for Callback {
         String::from("CALLBACK")
     }
 }
+
+#[derive(Serialize)]
+pub struct NotUnderstood {
+    pub path: Vec<String>,
+}
+
+impl Message for NotUnderstood {
+    fn name(&self) -> String {
+        String::from("NOT_UNDERSTOOD")
+    }
+}
-- 
cgit