From 54153914d22180777b25a1d4f5089ed2ae2839df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Wed, 13 Jan 2021 23:19:05 +0100
Subject: de-pub links on mumlib channels

---
 mumd/src/state/channel.rs | 13 +++++--------
 mumlib/src/state.rs       | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/mumd/src/state/channel.rs b/mumd/src/state/channel.rs
index 6995e1e..2ed05c5 100644
--- a/mumd/src/state/channel.rs
+++ b/mumd/src/state/channel.rs
@@ -169,13 +169,10 @@ pub fn into_channel(
 
 impl From<&Channel> for mumlib::state::Channel {
     fn from(channel: &Channel) -> Self {
-        mumlib::state::Channel {
-            description: channel.description.clone(),
-            links: Vec::new(),
-            max_users: channel.max_users,
-            name: channel.name.clone(),
-            children: Vec::new(),
-            users: Vec::new(),
-        }
+        mumlib::state::Channel::new(
+            channel.name.clone(),
+            channel.description.clone(),
+            channel.max_users,
+        )
     }
 }
diff --git a/mumlib/src/state.rs b/mumlib/src/state.rs
index 6fad332..772e822 100644
--- a/mumlib/src/state.rs
+++ b/mumlib/src/state.rs
@@ -12,14 +12,30 @@ pub struct Server {
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Channel {
     pub description: Option<String>,
-    pub links: Vec<Vec<usize>>, //to represent several walks through the tree to find channels its linked to
     pub max_users: u32,
     pub name: String,
     pub children: Vec<Channel>,
     pub users: Vec<User>,
+
+    links: Vec<Vec<usize>>, //to represent several walks through the tree to find channels its linked to
 }
 
 impl Channel {
+    pub fn new(
+        name: String,
+        description: Option<String>,
+        max_users: u32,
+    ) -> Self {
+        Self {
+            description,
+            max_users,
+            name,
+            children: Vec::new(),
+            users: Vec::new(),
+
+            links: Vec::new(),
+        }
+    }
     pub fn iter(&self) -> Iter<'_> {
         Iter {
             me: Some(&self),
-- 
cgit v1.2.1