Merge pull request #135 from odilia-app/notification-improvements

Notification improvements

.github/workflows/ci.yml

@@ -173,7 +173,7 @@ jobs:
           systemctl --user start dbus;
           xvfb-run dunst --screen 0 600x400x8 &
       - name: cargo llvm-cov
-        run: cargo llvm-cov --locked --lcov --output-path lcov.info
+        run: cargo llvm-cov --lcov --output-path lcov.info
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v3
         with:

odilia-notify/Cargo.toml

@@ -14,7 +14,9 @@ edition = "2021"
 
 [dependencies]
 futures = "0.3.30"
+itertools = "0.12.1"
 serde.workspace=true
+serde_repr = "0.1.18"
 thiserror = "1.0.56"
 tokio.workspace=true
 tracing.workspace=true

odilia-notify/src/action.rs

@@ -0,0 +1,7 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub struct Action {
+	pub name: String,
+	pub method: String,
+}

odilia-notify/src/lib.rs

@@ -2,7 +2,9 @@ use futures::{Stream, StreamExt};
 use tracing::{debug, info, instrument};
 
 use zbus::{fdo::MonitoringProxy, Connection, MatchRule, MessageStream, MessageType};
+mod action;
 mod notification;
+mod urgency;
 use notification::Notification;
 mod error;
 use error::NotifyError;

odilia-notify/src/notification.rs

@@ -4,11 +4,17 @@ use serde::{Deserialize, Serialize};
 
 use zbus::{zvariant::Value, Message};
 
-#[derive(Debug, Serialize, Deserialize)]
+use crate::action::Action;
+use crate::urgency::Urgency;
+use itertools::Itertools;
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Notification {
 	pub app_name: String,
 	pub title: String,
 	pub body: String,
+	pub urgency: Urgency,
+	pub actions: Vec<Action>,
 }
 
 type MessageBody<'a> =
@@ -18,9 +24,24 @@ 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>()?;
+		let mb: MessageBody = msg.body()?;
+		let (app_name, _, _, title, body, actions, mut options, _) = mb;
+		let actions = actions
+			.iter()
+			.tuples()
+			.map(|(name, method)| Action {
+				name: name.to_string(),
+				method: method.to_string(),
+			})
+			.collect();
+		// any error in deserailizing the value (including lack of "urgency" key in options
+		// hashmap)  will give it an urgency of Normal
+		let urgency = options
+			.remove("urgency")
+			.and_then(|o| o.try_into().ok())
+			.unwrap_or(Urgency::Normal);
 
-		Ok(Notification { app_name, title, body })
+		Ok(Notification { app_name, title, body, actions, urgency })
 	}
 }
 #[cfg(test)]

odilia-notify/src/urgency.rs

@@ -0,0 +1,28 @@
+use serde::{Deserialize, Serialize};
+use zbus::zvariant::{OwnedValue, Type, Value};
+
+/// A priority/urgency level.
+/// https://specifications.freedesktop.org/notification-spec/notification-spec-latest.html#urgency-levels
+#[derive(
+	Clone,
+	Copy,
+	Debug,
+	Type,
+	Serialize,
+	Deserialize,
+	Default,
+	Value,
+	OwnedValue,
+	Eq,
+	PartialEq,
+	PartialOrd,
+	Ord,
+)]
+#[zvariant(signature = "y")]
+#[repr(u8)]
+pub enum Urgency {
+	Low = 0,
+	#[default]
+	Normal = 1,
+	Critical = 2,
+}