From 57b97ffe94bc6a78273308396a26d47bee1a3243 Mon Sep 17 00:00:00 2001
From: Erin Nova <erin@the-system.eu.org>
Date: Sat, 17 Jul 2021 20:22:43 -0400
Subject: [PATCH] switch to proper rust docs

---
 Cargo.lock     | 18 +++++++++---------
 src/chat.rs    |  7 ++-----
 src/message.rs | 11 ++++-------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f75f5a2..9376268 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -123,9 +123,9 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "cc"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 
 [[package]]
 name = "cfg-if"
@@ -177,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "cookie"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf8865bac3d9a3bde5bde9088ca431b11f5d37c7a578b8086af77248b76627"
+checksum = "d5f1c7727e460397e56abc4bddc1d49e07a1ad78fc98eb2e1c8f032a58a2f80d"
 dependencies = [
  "percent-encoding 2.1.0",
  "time 0.2.27",
@@ -656,9 +656,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1345,7 +1345,7 @@ version = "0.5.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23c8b7d512d2fcac2316ebe590cde67573844b99e6cc9ee0f53375fa16e25ebd"
 dependencies = [
- "cookie 0.15.0",
+ "cookie 0.15.1",
  "either",
  "http",
  "hyper 0.14.10",
@@ -1527,9 +1527,9 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fdd7196b4ae35a111c6dc97f9cc152ca3ea8ad744f7cb46a9f27b3ef8f2f54"
+checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
 
 [[package]]
 name = "stable-pattern"
diff --git a/src/chat.rs b/src/chat.rs
index 6c3ed26..11eb351 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -1,13 +1,10 @@
 /* Contains Rocket code for chat/message functionality */
 extern crate log;
-extern crate rocket_contrib;
 use crate::message::Message;
-extern crate serde_derive;
-use rocket_contrib::json::{Json, JsonValue};
-use rocket::{data::FromData, response::Responder};
+use rocket::serde::json::{Json, JsonValue};
 
 #[post("/api/message/send", format = "json", data = "<message>")]
-pub fn send_message(message: Json<Message>) -> JsonValue {
+pub fn send_message(message: Json<Message<'_>>) -> JsonValue {
     json!({
         "status": "ok",
         "reason": "bruh"
diff --git a/src/message.rs b/src/message.rs
index 57801e9..ccb15f0 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1,15 +1,12 @@
 use uuid::Uuid;
 use chrono::prelude::*;
 use crate::user::User;
-use serde::{Deserialize, Serialize};
+use rocket::serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize)]
-pub struct Message {
-    /*
+pub struct Message<'r> {
     pub id: Uuid,
     pub user: User,
-    pub body: String,
-    pub created_at: DateTime<Utc>, */
-    id: u8,
-    body: String,
+    pub body: &'r str,
+    pub created_at: DateTime<Utc>,
 }