extend weather block to show sunset and sunrise

src/blocks/weather.rs

@@ -311,15 +311,11 @@ impl WeatherResult {
         }
 
         if let Some(sunset) = self.sunset {
-            values.extend(map! {
-            "sunset" => Value::datetime(sunset, None),
-            })
+            values.insert("sunset".into(), Value::datetime(sunset, None));
         }
 
         if let Some(sunrise) = self.sunrise {
-            values.extend(map! {
-            "sunrise" => Value::datetime(sunrise, None),
-            })
+            values.insert("sunrise".into(), Value::datetime(sunrise, None));
         }
         values
     }

src/blocks/weather/open_weather_map.rs

@@ -388,8 +388,8 @@ impl WeatherProvider for Service<'_> {
             })
         };
 
-        let sunrise = Some(DateTime::<Utc>::from_timestamp(current_data.sys.sunrise, 0).unwrap());
-        let sunset = Some(DateTime::<Utc>::from_timestamp(current_data.sys.sunset, 0).unwrap());
+        let sunrise = DateTime::<Utc>::from_timestamp(current_data.sys.sunrise, 0);
+        let sunset = DateTime::<Utc>::from_timestamp(current_data.sys.sunset, 0);
 
         Ok(WeatherResult {
             location: current_data.name,