Merge commit '7cbc88d1655f1668f431662dc334e262e93f4853' into notify

merge a pull request for odilia-notify and reflect it here as well

odilia-notify/src/lib.rs

@@ -1,5 +1,4 @@
 use futures::{Stream, StreamExt};
-use std::{ops::Deref, sync::Arc};
 use tracing::{debug, info, instrument};
 
 use zbus::{fdo::MonitoringProxy, Connection, MatchRule, MessageStream, MessageType};
@@ -30,11 +29,10 @@ pub async fn listen_to_dbus_notifications() -> Result<impl Stream<Item = Notific
 	debug!(?notify_rule, "finished generating rule");
 	info!("listening for notifications");
 	let notify_rule = notify_rule.to_string();
-	monitor.become_monitor(&[notify_rule.deref()], 0).await?;
+	monitor.become_monitor(&[notify_rule.as_str()], 0).await?;
 
 	let stream = MessageStream::from(monitor.connection()).filter_map(move |message| async {
-		let message = Arc::into_inner(message.ok()?)?; // Extract the Message from the Arc, I'm not sure whether this will work or not. Todo: try to find a better way of doing this
-		let notification = message.try_into().ok()?;
+		let notification = message.ok()?.try_into().ok()?;
 		debug!(?notification, "adding notification to stream");
 		Some(notification)
 	});

odilia-notify/src/notification.rs

@@ -1,25 +1,25 @@
-use std::collections::HashMap;
-
-use serde::{Deserialize, Serialize};
-
-use zbus::{zvariant::Value, Message};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Notification {
-	pub app_name: String,
-	pub title: String,
-	pub body: String,
-}
-
-type MessageBody<'a> =
-	(String, u32, &'a str, String, String, Vec<&'a str>, HashMap<&'a str, Value<'a>>, i32);
-
-impl TryFrom<Message> for Notification {
-	type Error = zbus::Error;
-
-	fn try_from(value: Message) -> Result<Self, Self::Error> {
-		let (app_name, _, _, title, body, ..) = value.body::<MessageBody>()?;
-
-		Ok(Notification { app_name, title, body })
-	}
-}
+use std::{collections::HashMap, sync::Arc};
+
+use serde::{Deserialize, Serialize};
+
+use zbus::{zvariant::Value, Message};
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Notification {
+	pub app_name: String,
+	pub title: String,
+	pub body: String,
+}
+
+type MessageBody<'a> =
+	(String, u32, &'a str, String, String, Vec<&'a str>, HashMap<&'a str, Value<'a>>, i32);
+
+impl TryFrom<Arc<Message>> for Notification {
+	type Error = zbus::Error;
+
+	fn try_from(msg: Arc<Message>) -> Result<Self, Self::Error> {
+		let (app_name, _, _, title, body, ..) = msg.body::<MessageBody>()?;
+
+		Ok(Notification { app_name, title, body })
+	}
+}

odilia-notify/tests/recieve_notifications.rs → odilia-notify/tests/receive_notifications.rs

@@ -20,7 +20,7 @@ async fn test_listen_to_dbus_notifications() -> Result<(), Box<dyn Error>> {
 	// Delay sending the notification
 	tokio::time::sleep(Duration::from_secs(1)).await;
 
-	// Send a Notification to see if it's correctly recieved on the other side
+	// Send a Notification to see if it's correctly received on the other side
 	Notification::new()
 		.appname("test-notify")
 		.summary("test summary")