feat: Improve data types for rich text blocks (#353)

Author: abdolence

examples/socket_mode.rs

@@ -155,6 +155,49 @@ impl SlackBlocksTemplate for SlackHomeTabBlocksTemplateExample {
                 some_into(SlackSectionBlock::new().with_text(md!("Latest news:")))
             ],
             new_blocks,
+            slack_blocks![
+                some_into(SlackDividerBlock::new()),
+                some_into(SlackRichTextBlock::new(
+                    vec![
+                        SlackRichTextSection::new(
+                            vec![
+                                SlackRichTextInlineElement::Text(
+                                    SlackRichTextText::new("Let's use some rich text: ".into())
+                                        .with_style(SlackRichTextStyle::new().with_bold(true))
+                                ),
+                                SlackRichTextInlineElement::Emoji(
+                                    SlackRichTextEmoji::new("slightly_smiling_face".into()).into()
+                                ),
+                            ]
+                            .into()
+                        )
+                        .into(),
+                        SlackRichTextSection::new(
+                            vec![SlackRichTextInlineElement::Date(SlackRichTextDate::new(
+                                SlackDateTime::now(),
+                                SlackDateTimeFormats::DateLong.to_string()
+                            ))]
+                            .into()
+                        )
+                        .into(),
+                        SlackRichTextQuote::new(
+                            vec![
+                                SlackRichTextInlineElement::Text(SlackRichTextText::new(
+                                    "While there is life, there is a hope. ".into()
+                                )),
+                                SlackRichTextInlineElement::Link(SlackRichTextLink::new(
+                                    Url::parse("https://slack-rust.abdolence.dev")
+                                        .expect("A proper url")
+                                        .into()
+                                ))
+                            ]
+                            .into()
+                        )
+                        .into(),
+                    ]
+                    .into()
+                ))
+            ],
         ]
         .concat()
     }

src/models/blocks/kit.rs

@@ -33,7 +33,6 @@ pub enum SlackBlock {
     Video(SlackVideoBlock),
     #[serde(rename = "markdown")]
     Markdown(SlackMarkdownBlock),
-
     #[serde(rename = "rich_text")]
     RichText(SlackRichTextBlock),
     #[serde(rename = "share_shortcut")]
@@ -1100,6 +1099,30 @@ pub enum SlackRichTextElement {
     Quote(SlackRichTextQuote),
 }
 
+impl From<SlackRichTextSection> for SlackRichTextElement {
+    fn from(element: SlackRichTextSection) -> Self {
+        SlackRichTextElement::Section(element)
+    }
+}
+
+impl From<SlackRichTextList> for SlackRichTextElement {
+    fn from(list: SlackRichTextList) -> Self {
+        SlackRichTextElement::List(list)
+    }
+}
+
+impl From<SlackRichTextPreformatted> for SlackRichTextElement {
+    fn from(element: SlackRichTextPreformatted) -> Self {
+        SlackRichTextElement::Preformatted(element)
+    }
+}
+
+impl From<SlackRichTextQuote> for SlackRichTextElement {
+    fn from(element: SlackRichTextQuote) -> Self {
+        SlackRichTextElement::Quote(element)
+    }
+}
+
 #[skip_serializing_none]
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, Builder)]
 pub struct SlackRichTextSection {
@@ -1184,7 +1207,7 @@ pub struct SlackRichTextText {
 #[skip_serializing_none]
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, Builder)]
 pub struct SlackRichTextLink {
-    pub url: String,
+    pub url: Url,
     pub text: Option<String>,
     #[serde(rename = "unsafe")]
     pub unsafe_: Option<bool>,
@@ -1222,7 +1245,7 @@ pub struct SlackRichTextEmoji {
 #[skip_serializing_none]
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, Builder)]
 pub struct SlackRichTextDate {
-    pub timestamp: i64,
+    pub timestamp: SlackDateTime,
     pub format: String,
     pub fallback: Option<String>,
     pub style: Option<SlackRichTextStyle>,

src/models/common/mod.rs

@@ -128,6 +128,12 @@ pub struct SlackBotId(pub String);
 #[derive(Debug, Eq, PartialEq, Hash, Clone, Serialize, Deserialize, ValueStruct)]
 pub struct SlackDateTime(#[serde(with = "ts_seconds")] pub DateTime<Utc>);
 
+impl SlackDateTime {
+    pub fn now() -> Self {
+        Self(Utc::now())
+    }
+}
+
 #[derive(Debug, Eq, PartialEq, Hash, Clone, Serialize, Deserialize, ValueStruct)]
 pub struct SlackDate(pub String);
 

src/models/events/push.rs

@@ -175,7 +175,7 @@ pub enum SlackMessageEventType {
     /// Catch-all for unknown subtypes Slack may add in the future.
     /// Preserves the original subtype string.
     #[serde(untagged)]
-    Unknown(String),
+    Other(String),
 }
 
 #[skip_serializing_none]