From a017872c99db4ed7951d957756833a20b1446ada Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Sun, 27 Jun 2021 00:13:35 +0100
Subject: [PATCH] Servers: Add categories to server model.
---
set_version.sh | 2 +-
src/database/entities/server.rs | 9 +++++++++
src/routes/servers/server_create.rs | 1 +
src/version.rs | 2 +-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/set_version.sh b/set_version.sh
index 65c5b51..83dbf61 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-export version=0.5.1-alpha.1-patch.0
+export version=0.5.1-alpha.2
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
diff --git a/src/database/entities/server.rs b/src/database/entities/server.rs
index 9f312f7..0953a99 100644
--- a/src/database/entities/server.rs
+++ b/src/database/entities/server.rs
@@ -46,6 +46,13 @@ pub struct Role {
// Bri'ish API conventions
}
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct Category {
+ pub id: String,
+ pub title: String,
+ pub channels: Vec<String>
+}
+
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct Ban {
#[serde(rename = "_id")]
@@ -81,6 +88,8 @@ pub struct Server {
pub channels: Vec<String>,
#[serde(skip_serializing_if = "Option::is_none")]
+ pub categories: Option<Vec<Category>>,
+ #[serde(skip_serializing_if = "Option::is_none")]
pub system_messages: Option<SystemMessageChannels>,
#[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
diff --git a/src/routes/servers/server_create.rs b/src/routes/servers/server_create.rs
index 29425e4..dfff554 100644
--- a/src/routes/servers/server_create.rs
+++ b/src/routes/servers/server_create.rs
@@ -55,6 +55,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
description: info.description,
channels: vec![cid.clone()],
+ categories: None,
system_messages: Some(SystemMessageChannels {
user_joined: Some(cid.clone()),
user_left: Some(cid.clone()),
diff --git a/src/version.rs b/src/version.rs
index e25a46d..1727275 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.5.1-alpha.1-patch.0";
+pub const VERSION: &str = "0.5.1-alpha.2";
--
GitLab