1 files changed, 24 insertions, 16 deletions

diff --git a/src/modules/blog/module.rs b/src/modules/blog/module.rs
index 2336fb4..6d3c253 100644
--- a/src/modules/blog/module.rs
+++ b/src/modules/blog/module.rs
@@ -120,17 +120,18 @@ pub fn module(router: &mut windmark::router::Router) {
               .name()
               .clone()
               .unwrap_or_else(|| title.clone());
-            let description = config
-              .unwrap_or_default()
-              .description()
-              .clone()
-              .unwrap_or_else(|| "One of Fuwn's blogs".to_string());
+            let description = config.unwrap_or_default().description().clone();
+            // .unwrap_or_else(|| "One of Fuwn's blogs".to_string());
 
             format!(
-              "=> {} {} ― {}",
+              "=> {} {}{}",
               format_args!("/blog/{}", name.replace(' ', "_").to_lowercase(),),
               name,
-              description
+              if description.is_some() {
+                format!(" ― {}", description.unwrap())
+              } else {
+                String::new()
+              }
             )
           })
           .collect::<Vec<_>>()
@@ -154,18 +155,18 @@ pub fn module(router: &mut windmark::router::Router) {
       .name()
       .clone()
       .unwrap_or_else(|| blog.clone());
-    let description = config
-      .clone()
-      .unwrap_or_default()
-      .description()
-      .clone()
-      .unwrap_or_else(|| "One of Fuwn's blogs".to_string());
+    let description = config.clone().unwrap_or_default().description().clone();
+    // .unwrap_or_else(|| "One of Fuwn's blogs".to_string());
     let config_clone = config.clone();
     let mut xml = XmlWriter::builder();
 
     xml.add_field("title", &name);
     xml.add_field("link", &format!("{ROOT_GEMINI_URL}/blog/{fixed_blog_name}"));
-    xml.add_field("description", &description);
+
+    if description.is_some() {
+      xml.add_field("description", &description.clone().unwrap());
+    }
+
     xml.add_field("generator", "locus");
     xml.add_field("lastBuildDate", &chrono::Local::now().to_rfc2822());
     xml.add_link(&format!("{ROOT_GEMINI_URL}/blog/{fixed_blog_name}.xml"));
@@ -173,7 +174,14 @@ pub fn module(router: &mut windmark::router::Router) {
     track_mount(
       router,
       &format!("/blog/{fixed_blog_name}"),
-      &format!("{name} ― {description}"),
+      &format!(
+        "{name}{}",
+        if description.clone().is_some() {
+          format!(" ― {}", description.clone().unwrap())
+        } else {
+          String::new()
+        }
+      ),
       move |context| {
         let fixed_blog_name = fixed_blog_name_clone.clone();
 
@@ -183,7 +191,7 @@ pub fn module(router: &mut windmark::router::Router) {
              {0}'s RSS feed\n\n=> {} here!",
             blog,
             entries_clone.len(),
-            description,
+            description.clone().unwrap_or_else(String::new),
             entries_clone
               .keys()
               .map(Clone::clone)