Add "Open Buffer" as a secondary action when the default is to activate Halloy, and remove it as a secondary when it is the default (it will be displayed twice in that case, on macOS).

Author: andymandias

CHANGELOG.md

@@ -8,7 +8,7 @@ Added:
 - Support displaying a larger version of the card images in-app
 - IRCv3 `no-implicit-names` support
 - Keyboard shortcuts validation (e.g no duplicate key binds)
-- `actions.buffer.notification` setting to control how interacting with notifications is handled
+- `actions.buffer.notifications` settings to control how interacting with notifications is handled
 - `actions.buffer.click_nickname` and `actions.nicklist.click_nickname` can be used to specify whether a nickname will: open query and how the query is opened, insert nickname in the input box, or no action (`"no-action"` or `"noop"`); takes over functionality from `buffer.nickname.click` and `buffer.channel.nicklist.click` and adds the ability to perform no action
 - `actions.buffer.click_channel_name` and `actions.buffer.click_highlight` can be set to no action (`"no-action"` or `"noop"`) to not open the channel when clicking on the channel name
 - Explicit portable mode

data/src/config/actions.rs

@@ -8,7 +8,7 @@ pub struct Actions {
     pub sidebar: Sidebar,
     pub buffer: Buffer,
     pub nicklist: Nicklist,
-    pub notification: NotificationAction,
+    pub notification: Notification,
 }
 
 #[derive(Debug, Default, Clone, Deserialize)]
@@ -138,43 +138,16 @@ impl<'de> Deserialize<'de> for ChannelClickAction {
     }
 }
 
-#[derive(Debug, Copy, Clone, Default)]
-pub enum NotificationAction {
-    OpenBuffer(BufferAction),
-    #[default]
-    Noop,
+#[derive(Debug, Copy, Clone, Default, Deserialize)]
+#[serde(default)]
+pub struct Notification {
+    pub default: NotificationAction,
+    pub open_buffer: BufferAction,
 }
 
-impl<'de> Deserialize<'de> for NotificationAction {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(rename_all = "kebab-case")]
-        enum ClickAction {
-            OpenBuffer(BufferAction),
-            #[serde(alias = "no-action")]
-            Noop,
-        }
-
-        #[derive(Deserialize)]
-        #[serde(untagged)]
-        enum Action {
-            ClickAction(ClickAction),
-            BufferAction(BufferAction),
-        }
-
-        match Action::deserialize(deserializer)? {
-            Action::ClickAction(click_action) => match click_action {
-                ClickAction::OpenBuffer(buffer_action) => {
-                    Ok(NotificationAction::OpenBuffer(buffer_action))
-                }
-                ClickAction::Noop => Ok(NotificationAction::Noop),
-            },
-            Action::BufferAction(buffer_action) => {
-                Ok(NotificationAction::OpenBuffer(buffer_action))
-            }
-        }
-    }
+#[derive(Debug, Copy, Clone, Default, Deserialize)]
+pub enum NotificationAction {
+    OpenBuffer,
+    #[default]
+    ActivateApplication,
 }

docs/configuration/actions.md

@@ -4,7 +4,7 @@ Application-wide actions; how user actions should be enacted.
 
 ## `buffer`
 
-How buffer actions should be enacted
+How buffer actions should be enacted.
 
 ```toml
 # Replace pane when clicking on channel/user names in a pane
@@ -111,7 +111,7 @@ join_channel = "replace-pane"
 
 ## `nicklist`
 
-How nicklist actions should be enacted
+How nicklist actions should be enacted.
 
 ```toml
 # Replace pane when clicking on a nickname in the nicklist
@@ -139,15 +139,40 @@ click_nickname = { "open-query" = "replace-pane" }
 
 ## `notification`
 
-Action when clicking on a notification with a buffer context (e.g. when clicking a notification for a highlight in a channel, the context is the channel buffer). `"new-pane"` opens a new pane each time. `"replace-pane"` replaces the focused pane with the buffer context. `"new-window"` opens a new window each time. `"no-action"` or `"noop"` will perform no action on clicks aside from the default application activation behavior.
+How notification actions should be enacted.
+
+```toml
+# Open buffer in a new window when clicking on a notification
+
+[actions.notification]
+default = "open-buffer"
+open_buffer = "new-window"
+```
+
+### `default`
+
+Default action when clicking on a notification.  When set to `"activate-application"` or when there is no buffer context for the notification (e.g. when clicking a notification for a monitored user going offline), then the default application activation behavior for notification will be enacted.  When there is a buffer context (e.g. when clicking a notification for a highlight in a channel, the context is the channel buffer) and set to `"open-buffer"`, then the buffer context will be opened.  If there is a buffer context and `"activate-application"` is set, then `"open-buffer"` will be provided as a secondary action (if supported by the notification system).  When opening a buffer, [`actions.notification.open_buffer`](#open_buffer) determines how it will be opened.
 
 ```toml
 # Type: string
-# Values: "new-pane", "replace-pane", "new-window", "no-action", "noop"
-# Default: "noop"
+# Values: "activate-application", "open-buffer"
+# Default: "activate-application"
+
+[actions.notification]
+default = "open-buffer"
+```
+
+### `open_buffer`
+
+When opening a buffer from a notification, how it will be opened. `"new-pane"` opens a new pane each time. `"replace-pane"` replaces the focused pane with the buffer. `"new-window"` opens a new window each time.
+
+```toml
+# Type: string
+# Values: "new-pane", "replace-pane", "new-window"
+# Default: "new-pane"
 
-[actions]
-notification = "new-pane"
+[actions.notification]
+open_buffer = "replace-pane"
 ```
 
 ## `sidebar`

src/notification.rs

@@ -516,7 +516,7 @@ impl Notifications {
 
         self.execute(
             notification_config,
-            config.actions.notification,
+            config.actions.notification.default,
             notification,
             &title,
             subtitle.as_deref(),

src/notification/toast.rs

@@ -75,11 +75,17 @@ impl Toast {
             notification.app_id(data::environment::APPLICATION_ID);
         }
 
-        if has_buffer_context
-            && !matches!(notification_action, NotificationAction::Noop)
-        {
-            notification.action("default", "Open Buffer");
-            notification.action("open_or_focus_buffer", "Open Buffer");
+        match notification_action {
+            NotificationAction::ActivateApplication => {
+                if has_buffer_context {
+                    notification.action("open_or_focus_buffer", "Open Buffer");
+                }
+            }
+            NotificationAction::OpenBuffer => {
+                if has_buffer_context {
+                    notification.action("default", "Open Buffer");
+                }
+            }
         }
 
         Self(notification.finalize())

src/screen/dashboard.rs

@@ -9,7 +9,6 @@ use chrono::{DateTime, Utc};
 use data::capabilities::{
     LabeledResponseContext, MultilineBatchKind, multiline_concat_lines,
 };
-use data::config::actions::NotificationAction;
 use data::config::buffer::{ScrollPosition, UsernameFormat};
 use data::dashboard::{self, BufferAction};
 use data::environment::{RELEASE_WEBSITE, WIKI_WEBSITE};
@@ -4637,10 +4636,7 @@ impl Dashboard {
                 match action {
                     toast::Action::Dismiss => Task::none(),
                     toast::Action::OpenOrFocusBuffer => {
-                        if let Some(buffer) = buffer
-                            && let NotificationAction::OpenBuffer(buffer_action) =
-                                config.actions.notification
-                        {
+                        if let Some(buffer) = buffer {
                             // When an notification action is performed in Wayland
                             // the application is not automatically brought forward.
                             // Request attention in order to do so.
@@ -4661,7 +4657,7 @@ impl Dashboard {
                             .chain(
                                 self.open_or_focus_buffer(
                                     buffer,
-                                    buffer_action,
+                                    config.actions.notification.open_buffer,
                                     clients,
                                     config,
                                 ),