From fec541b7aaf790acd933eda509b3a0dda20d05b9 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Fri, 11 Feb 2022 22:43:39 +0100
Subject: [PATCH] Rename User to Session

---
 cove-core/src/lib.rs                  |  4 ++--
 cove-core/src/packets.rs              | 16 ++++++++--------
 cove-core/src/{user.rs => session.rs} |  4 ++--
 cove-server/src/main.rs               | 23 +++++++++++++++--------
 4 files changed, 27 insertions(+), 20 deletions(-)
 rename cove-core/src/{user.rs => session.rs} (79%)

diff --git a/cove-core/src/lib.rs b/cove-core/src/lib.rs
index c2bdeb4..db865b4 100644
--- a/cove-core/src/lib.rs
+++ b/cove-core/src/lib.rs
@@ -2,8 +2,8 @@ mod id;
 mod macros;
 mod message;
 pub mod packets;
-mod user;
+mod session;
 
 pub use self::id::*;
 pub use self::message::*;
-pub use self::user::*;
+pub use self::session::*;
diff --git a/cove-core/src/packets.rs b/cove-core/src/packets.rs
index 4ba1e4a..6afa502 100644
--- a/cove-core/src/packets.rs
+++ b/cove-core/src/packets.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::macros::packets;
-use crate::{Message, MessageId, User};
+use crate::{Message, MessageId, Session};
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct HelloCmd {
@@ -14,8 +14,8 @@ pub struct HelloCmd {
 #[serde(tag = "type")]
 pub enum HelloRpl {
     Success {
-        you: User,
-        others: Vec<User>,
+        you: Session,
+        others: Vec<Session>,
         last_message: MessageId,
     },
     InvalidRoom {
@@ -60,23 +60,23 @@ pub struct WhoCmd {}
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct WhoRpl {
-    pub you: User,
-    pub others: Vec<User>,
+    pub you: Session,
+    pub others: Vec<Session>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct JoinNtf {
-    pub user: User,
+    pub who: Session,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct NickNtf {
-    pub user: User,
+    pub who: Session,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct PartNtf {
-    pub user: User,
+    pub who: Session,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
diff --git a/cove-core/src/user.rs b/cove-core/src/session.rs
similarity index 79%
rename from cove-core/src/user.rs
rename to cove-core/src/session.rs
index 94d4090..d595484 100644
--- a/cove-core/src/user.rs
+++ b/cove-core/src/session.rs
@@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize};
 use crate::{Identity, SessionId};
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct User {
+pub struct Session {
+    pub id: SessionId,
     pub nick: String,
     pub identity: Identity,
-    pub sid: SessionId,
 }
diff --git a/cove-server/src/main.rs b/cove-server/src/main.rs
index ab1ec9b..fd548c0 100644
--- a/cove-server/src/main.rs
+++ b/cove-server/src/main.rs
@@ -2,16 +2,17 @@ use cove_core::packets::{
     Cmd, HelloCmd, HelloRpl, JoinNtf, NickCmd, NickNtf, NickRpl, Ntf, Packet, PartNtf, Rpl,
     SendCmd, SendNtf, SendRpl, WhoCmd, WhoRpl,
 };
-use cove_core::{Identity, Message, MessageId, SessionId, User};
+use cove_core::{Identity, Message, MessageId, Session, SessionId};
 use futures::{future, StreamExt, TryStreamExt};
 use tokio::net::{TcpListener, TcpStream};
+use tokio::sync::mpsc::Sender;
 
 #[tokio::main]
 async fn main() {
-    let user = User {
+    let session = Session {
+        id: SessionId::of("12345"),
         nick: "Garmy".to_string(),
         identity: Identity::of("random garbage"),
-        sid: SessionId::of("12345"),
     };
     let message = Message {
         pred: MessageId::of("pred"),
@@ -37,7 +38,7 @@ async fn main() {
         serde_json::to_string_pretty(&Packet::Rpl {
             id: 67890,
             rpl: Rpl::Hello(HelloRpl::Success {
-                you: user.clone(),
+                you: session.clone(),
                 others: vec![],
                 last_message: MessageId::of("Blarg")
             })
@@ -127,7 +128,7 @@ async fn main() {
         serde_json::to_string_pretty(&Packet::Rpl {
             id: 67890,
             rpl: Rpl::Who(WhoRpl {
-                you: user.clone(),
+                you: session.clone(),
                 others: vec![]
             })
         })
@@ -136,21 +137,27 @@ async fn main() {
     println!(
         "{}",
         serde_json::to_string_pretty(&Packet::Ntf {
-            ntf: Ntf::Join(JoinNtf { user: user.clone() })
+            ntf: Ntf::Join(JoinNtf {
+                who: session.clone()
+            })
         })
         .unwrap()
     );
     println!(
         "{}",
         serde_json::to_string_pretty(&Packet::Ntf {
-            ntf: Ntf::Nick(NickNtf { user: user.clone() })
+            ntf: Ntf::Nick(NickNtf {
+                who: session.clone()
+            })
         })
         .unwrap()
     );
     println!(
         "{}",
         serde_json::to_string_pretty(&Packet::Ntf {
-            ntf: Ntf::Part(PartNtf { user: user.clone() })
+            ntf: Ntf::Part(PartNtf {
+                who: session.clone()
+            })
         })
         .unwrap()
     );