diff --git a/set_version.sh b/set_version.sh index 65c5b5181206622a153767d2289f18c6bc0badd8..83dbf614a742287a3cadb5a7f587dd95b27fd72a 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 9f312f74b0c0240b71705e719f5012f637a49b0f..0953a99bbe9daec40285141f72b5849b70c0222e 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 29425e4f770193346fa70db5b90b109714081bbc..dfff554942ca1736c43dbf7ccec10d82b763c6ce 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 e25a46de9e564f797c4f50a5f987872d1f0ed1df..17272757b587060f9bc617b24f4ae510bf73edee 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";