Strict typing for system messages; add a way to rename group.

src/database/entities/message.rs

@@ -17,6 +17,47 @@ use web_push::{
     ContentEncoding, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
 };
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(tag = "type")]
+pub enum MessageEmbed {
+    Dummy
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(tag = "type")]
+pub enum SystemMessage {
+    #[serde(rename = "text")]
+    Text {
+        content: String
+    },
+    #[serde(rename = "user_added")]
+    UserAdded {
+        id: String,
+        by: String
+    },
+    #[serde(rename = "user_remove")]
+    UserRemove {
+        id: String,
+        by: String
+    },
+    #[serde(rename = "user_left")]
+    UserLeft {
+        id: String
+    },
+    #[serde(rename = "channel_renamed")]
+    ChannelRenamed {
+        name: String,
+        by: String
+    },
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(untagged)]
+pub enum Content {
+    Text(String),
+    SystemMessage(SystemMessage)
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Message {
     #[serde(rename = "_id")]
@@ -26,15 +67,17 @@ pub struct Message {
     pub channel: String,
     pub author: String,
 
-    pub content: String,
+    pub content: Content,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub attachment: Option<File>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub edited: Option<DateTime>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub embeds: Option<MessageEmbed>,
 }
 
 impl Message {
-    pub fn create(author: String, channel: String, content: String) -> Message {
+    pub fn create(author: String, channel: String, content: Content) -> Message {
         Message {
             id: Ulid::new().to_string(),
             nonce: None,
@@ -44,6 +87,7 @@ impl Message {
             content,
             attachment: None,
             edited: None,
+            embeds: None
         }
     }
 
@@ -56,22 +100,28 @@ impl Message {
                 with: "message",
             })?;
 
+        let mut set = if let Content::Text(text) = &self.content {
+            doc! {
+                "last_message": {
+                    "_id": self.id.clone(),
+                    "author": self.author.clone(),
+                    "short": text.chars().take(24).collect::<String>()
+                }
+            }
+        } else {
+            doc! {}
+        };
+
         // ! FIXME: temp code
         let channels = get_collection("channels");
         match &channel {
             Channel::DirectMessage { id, .. } => {
+                set.insert("active", true);
                 channels
                     .update_one(
                         doc! { "_id": id },
                         doc! {
-                            "$set": {
-                                "active": true,
-                                "last_message": {
-                                    "_id": self.id.clone(),
-                                    "author": self.author.clone(),
-                                    "short": self.content.chars().take(24).collect::<String>()
-                                }
-                            }
+                            "$set": set
                         },
                         None,
                     )
@@ -86,13 +136,7 @@ impl Message {
                     .update_one(
                         doc! { "_id": id },
                         doc! {
-                            "$set": {
-                                "last_message": {
-                                    "_id": self.id.clone(),
-                                    "author": self.author.clone(),
-                                    "short": self.content.chars().take(24).collect::<String>()
-                                }
-                            }
+                            "$set": set
                         },
                         None,
                     )

src/database/permissions/channel.rs

@@ -12,7 +12,8 @@ pub enum ChannelPermission {
     View = 1,
     SendMessage = 2,
     ManageMessages = 4,
-    VoiceCall = 8,
+    ManageChannel = 8,
+    VoiceCall = 16,
 }
 
 bitfield! {
@@ -21,7 +22,8 @@ bitfield! {
     pub get_view, _: 31;
     pub get_send_message, _: 30;
     pub get_manage_messages, _: 29;
-    pub get_voice_call, _: 28;
+    pub get_manage_channel, _: 28;
+    pub get_voice_call, _: 27;
 }
 
 impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
@@ -69,7 +71,7 @@ impl<'a> PermissionCalculator<'a> {
                     .find(|x| *x == &self.perspective.id)
                     .is_some()
                 {
-                    Ok(ChannelPermission::View + ChannelPermission::SendMessage + ChannelPermission::VoiceCall)
+                    Ok(ChannelPermission::View + ChannelPermission::SendMessage + ChannelPermission::ManageChannel + ChannelPermission::VoiceCall)
                 } else {
                     Ok(0)
                 }