🐛 fix(notifications): ensure notification history consistency and ignore specific apps
This commit is contained in:
7 files changed
+172
-61
No files matched your search
@@ -11,5 +11,3 @@ config/assets/screentime.json
|
|||||||
config/hypr/modus.conf
|
config/hypr/modus.conf
|
||||||
config/hypr/colors.conf
|
config/hypr/colors.conf
|
||||||
styles/colors.css
|
styles/colors.css
|
||||||
gray/*
|
|
||||||
gray
|
|
||||||
+2
-3
@@ -41,12 +41,11 @@ DOCK_THEME = "Pills"
|
|||||||
|
|
||||||
def load_config():
|
def load_config():
|
||||||
"""Load the configuration from config.json"""
|
"""Load the configuration from config.json"""
|
||||||
config_path = os.path.expanduser(f"~/{APP_NAME_CAP}/config/assets/config.json")
|
|
||||||
config = {}
|
config = {}
|
||||||
|
|
||||||
if os.path.exists(config_path):
|
if os.path.exists(CONFIG_FILE):
|
||||||
try:
|
try:
|
||||||
with open(config_path, "r") as f:
|
with open(CONFIG_FILE, "r") as f:
|
||||||
config = json.load(f)
|
config = json.load(f)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error loading config: {e}")
|
print(f"Error loading config: {e}")
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ DEFAULTS = {
|
|||||||
"dock_notifications_visible": True,
|
"dock_notifications_visible": True,
|
||||||
"dock_applications_visible": True,
|
"dock_applications_visible": True,
|
||||||
"dock_language_visible": True,
|
"dock_language_visible": True,
|
||||||
'dock_hide_special_workspace': True,
|
"dock_hide_special_workspace": True,
|
||||||
"workspace_nums": False,
|
"workspace_nums": False,
|
||||||
"workspace_use_chinese_numerals": False,
|
"workspace_use_chinese_numerals": False,
|
||||||
"workspace_dots": False,
|
"workspace_dots": False,
|
||||||
@@ -71,4 +71,6 @@ DEFAULTS = {
|
|||||||
"gpu": False,
|
"gpu": False,
|
||||||
},
|
},
|
||||||
"metrics_disks": ["/"],
|
"metrics_disks": ["/"],
|
||||||
|
"limited_apps_history": ["Spotify"],
|
||||||
|
"history_ignored_apps": ["Modus"],
|
||||||
}
|
}
|
||||||
+89
-12
@@ -662,6 +662,63 @@ class HyprConfGUI(Window):
|
|||||||
)
|
)
|
||||||
system_grid.attach(note_label, 2, row, 2, 1)
|
system_grid.attach(note_label, 2, row, 2, 1)
|
||||||
|
|
||||||
|
# Notifications app lists section
|
||||||
|
notifications_header = Label(
|
||||||
|
markup="<b>Notification Settings</b>", h_align="start"
|
||||||
|
)
|
||||||
|
vbox.add(notifications_header)
|
||||||
|
|
||||||
|
notif_grid = Gtk.Grid()
|
||||||
|
notif_grid.set_column_spacing(20)
|
||||||
|
notif_grid.set_row_spacing(10)
|
||||||
|
notif_grid.set_margin_start(10)
|
||||||
|
notif_grid.set_margin_top(5)
|
||||||
|
notif_grid.set_margin_bottom(15)
|
||||||
|
vbox.add(notif_grid)
|
||||||
|
|
||||||
|
# Limited Apps History
|
||||||
|
limited_apps_label = Label(
|
||||||
|
label="Limited Apps History:", h_align="start", v_align="center"
|
||||||
|
)
|
||||||
|
notif_grid.attach(limited_apps_label, 0, 0, 1, 1)
|
||||||
|
|
||||||
|
limited_apps_list = bind_vars.get("limited_apps_history", ["Spotify"])
|
||||||
|
limited_apps_text = ", ".join(f'"{app}"' for app in limited_apps_list)
|
||||||
|
self.limited_apps_entry = Entry(
|
||||||
|
text=limited_apps_text,
|
||||||
|
tooltip_text='Enter app names separated by commas, e.g: "Spotify", "Discord"',
|
||||||
|
h_expand=True,
|
||||||
|
)
|
||||||
|
notif_grid.attach(self.limited_apps_entry, 1, 0, 1, 1)
|
||||||
|
|
||||||
|
limited_apps_hint = Label(
|
||||||
|
markup='<small>Apps with limited notification history (format: "App1", "App2")</small>',
|
||||||
|
h_align="start",
|
||||||
|
)
|
||||||
|
notif_grid.attach(limited_apps_hint, 0, 1, 2, 1)
|
||||||
|
|
||||||
|
# History Ignored Apps
|
||||||
|
ignored_apps_label = Label(
|
||||||
|
label="History Ignored Apps:", h_align="start", v_align="center"
|
||||||
|
)
|
||||||
|
notif_grid.attach(ignored_apps_label, 0, 2, 1, 1)
|
||||||
|
|
||||||
|
ignored_apps_list = bind_vars.get("history_ignored_apps", ["Modus"])
|
||||||
|
ignored_apps_text = ", ".join(f'"{app}"' for app in ignored_apps_list)
|
||||||
|
self.ignored_apps_entry = Entry(
|
||||||
|
text=ignored_apps_text,
|
||||||
|
tooltip_text='Enter app names separated by commas, e.g: "Modus", "Screenshot"',
|
||||||
|
h_expand=True,
|
||||||
|
)
|
||||||
|
notif_grid.attach(self.ignored_apps_entry, 1, 2, 1, 1)
|
||||||
|
|
||||||
|
ignored_apps_hint = Label(
|
||||||
|
markup='<small>Apps whose notifications are ignored in history (format: "App1", "App2")</small>',
|
||||||
|
h_align="start",
|
||||||
|
)
|
||||||
|
notif_grid.attach(ignored_apps_hint, 0, 3, 2, 1)
|
||||||
|
|
||||||
|
|
||||||
metrics_header = Label(markup="<b>System Metrics Options</b>", h_align="start")
|
metrics_header = Label(markup="<b>System Metrics Options</b>", h_align="start")
|
||||||
vbox.add(metrics_header)
|
vbox.add(metrics_header)
|
||||||
metrics_grid = Gtk.Grid(
|
metrics_grid = Gtk.Grid(
|
||||||
@@ -771,18 +828,6 @@ class HyprConfGUI(Window):
|
|||||||
repo_box.add(repo_link)
|
repo_box.add(repo_link)
|
||||||
vbox.add(repo_box)
|
vbox.add(repo_box)
|
||||||
|
|
||||||
# def on_kofi_clicked(_):
|
|
||||||
# import webbrowser
|
|
||||||
|
|
||||||
# webbrowser.open("https://github.com/S4NKALP")
|
|
||||||
|
|
||||||
# kofi_btn = Button(
|
|
||||||
# label="Support on Ko-Fi ❤️",
|
|
||||||
# on_clicked=on_kofi_clicked,
|
|
||||||
# tooltip_text="Support S4NKALP on Ko-Fi",
|
|
||||||
# style="margin-top: 18px; min-width: 160px;",
|
|
||||||
# )
|
|
||||||
# vbox.add(kofi_btn)
|
|
||||||
vbox.add(Box(v_expand=True))
|
vbox.add(Box(v_expand=True))
|
||||||
return vbox
|
return vbox
|
||||||
|
|
||||||
@@ -919,6 +964,29 @@ class HyprConfGUI(Window):
|
|||||||
and isinstance(child.get_children()[0], Entry)
|
and isinstance(child.get_children()[0], Entry)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# Parse notification app lists
|
||||||
|
def parse_app_list(text):
|
||||||
|
"""Parse comma-separated app names with quotes"""
|
||||||
|
if not text.strip():
|
||||||
|
return []
|
||||||
|
apps = []
|
||||||
|
for app in text.split(","):
|
||||||
|
app = app.strip()
|
||||||
|
if app.startswith('"') and app.endswith('"'):
|
||||||
|
app = app[1:-1]
|
||||||
|
elif app.startswith("'") and app.endswith("'"):
|
||||||
|
app = app[1:-1]
|
||||||
|
if app:
|
||||||
|
apps.append(app)
|
||||||
|
return apps
|
||||||
|
|
||||||
|
current_bind_vars_snapshot["limited_apps_history"] = parse_app_list(
|
||||||
|
self.limited_apps_entry.get_text()
|
||||||
|
)
|
||||||
|
current_bind_vars_snapshot["history_ignored_apps"] = parse_app_list(
|
||||||
|
self.ignored_apps_entry.get_text()
|
||||||
|
)
|
||||||
|
|
||||||
selected_icon_path = self.selected_face_icon
|
selected_icon_path = self.selected_face_icon
|
||||||
replace_lock = self.lock_switch and self.lock_switch.get_active()
|
replace_lock = self.lock_switch and self.lock_switch.get_active()
|
||||||
replace_idle = self.idle_switch and self.idle_switch.get_active()
|
replace_idle = self.idle_switch and self.idle_switch.get_active()
|
||||||
@@ -1188,6 +1256,15 @@ class HyprConfGUI(Window):
|
|||||||
for p in DEFAULTS.get("metrics_disks", ["/"]):
|
for p in DEFAULTS.get("metrics_disks", ["/"]):
|
||||||
self._add_disk_edit_entry_func(p)
|
self._add_disk_edit_entry_func(p)
|
||||||
|
|
||||||
|
# Reset notification app lists
|
||||||
|
limited_apps_list = DEFAULTS.get("limited_apps_history", ["Spotify"])
|
||||||
|
limited_apps_text = ", ".join(f'"{app}"' for app in limited_apps_list)
|
||||||
|
self.limited_apps_entry.set_text(limited_apps_text)
|
||||||
|
|
||||||
|
ignored_apps_list = DEFAULTS.get("history_ignored_apps", ["Hyprshot"])
|
||||||
|
ignored_apps_text = ", ".join(f'"{app}"' for app in ignored_apps_list)
|
||||||
|
self.ignored_apps_entry.set_text(ignored_apps_text)
|
||||||
|
|
||||||
self._update_panel_position_sensitivity()
|
self._update_panel_position_sensitivity()
|
||||||
|
|
||||||
self.selected_face_icon = None
|
self.selected_face_icon = None
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from gi.repository import Gdk, GLib, Gtk
|
|||||||
|
|
||||||
import config.data as data
|
import config.data as data
|
||||||
import utils.icons as icons
|
import utils.icons as icons
|
||||||
from modules.notification_popup import NotificationBox
|
from modules.notification_popup import NotificationBox, get_limited_apps_history, get_history_ignored_apps
|
||||||
from utils.custom_image import CustomImage
|
from utils.custom_image import CustomImage
|
||||||
from utils.notification_utils import (
|
from utils.notification_utils import (
|
||||||
CONFIG_FILE,
|
CONFIG_FILE,
|
||||||
@@ -169,8 +169,6 @@ class NotificationHistory(Box):
|
|||||||
|
|
||||||
self._load_and_sync_dnd_state()
|
self._load_and_sync_dnd_state()
|
||||||
|
|
||||||
self.LIMITED_APPS_HISTORY = ["Spotify"]
|
|
||||||
|
|
||||||
def _connect_to_shared_history(self):
|
def _connect_to_shared_history(self):
|
||||||
try:
|
try:
|
||||||
shared_history = get_shared_notification_history()
|
shared_history = get_shared_notification_history()
|
||||||
|
|||||||
@@ -15,15 +15,24 @@ import utils.icons as icons
|
|||||||
from utils.custom_image import CustomImage
|
from utils.custom_image import CustomImage
|
||||||
from utils.wayland import WaylandWindow as Window
|
from utils.wayland import WaylandWindow as Window
|
||||||
from utils.notification_utils import (
|
from utils.notification_utils import (
|
||||||
LIMITED_APPS,
|
|
||||||
cache_notification_pixbuf,
|
cache_notification_pixbuf,
|
||||||
load_scaled_pixbuf,
|
load_scaled_pixbuf,
|
||||||
get_shared_notification_history,
|
get_shared_notification_history,
|
||||||
NotificationHistory,
|
NotificationHistory,
|
||||||
delete_cached_image
|
delete_cached_image,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_limited_apps_history():
|
||||||
|
config = data.load_config()
|
||||||
|
return config.get("limited_apps_history", ["Spotify"])
|
||||||
|
|
||||||
|
|
||||||
|
def get_history_ignored_apps():
|
||||||
|
config = data.load_config()
|
||||||
|
return config.get("history_ignored_apps", ["Modus"])
|
||||||
|
|
||||||
|
|
||||||
class ActionButton(Button):
|
class ActionButton(Button):
|
||||||
def __init__(
|
def __init__(
|
||||||
self, action: NotificationAction, index: int, total: int, notification_box
|
self, action: NotificationAction, index: int, total: int, notification_box
|
||||||
@@ -115,18 +124,18 @@ class NotificationBox(Box):
|
|||||||
|
|
||||||
def set_is_history(self, is_history):
|
def set_is_history(self, is_history):
|
||||||
# Ensure the object is properly initialized
|
# Ensure the object is properly initialized
|
||||||
if not hasattr(self, '_is_history'):
|
if not hasattr(self, "_is_history"):
|
||||||
self._is_history = False
|
self._is_history = False
|
||||||
self._is_history = is_history
|
self._is_history = is_history
|
||||||
|
|
||||||
def set_container(self, container):
|
def set_container(self, container):
|
||||||
# Ensure the object is properly initialized
|
# Ensure the object is properly initialized
|
||||||
if not hasattr(self, '_container'):
|
if not hasattr(self, "_container"):
|
||||||
self._container = None
|
self._container = None
|
||||||
self._container = container
|
self._container = container
|
||||||
|
|
||||||
def get_container(self):
|
def get_container(self):
|
||||||
return getattr(self, '_container', None)
|
return getattr(self, "_container", None)
|
||||||
|
|
||||||
def create_header(self):
|
def create_header(self):
|
||||||
notification = self.notification
|
notification = self.notification
|
||||||
@@ -268,12 +277,12 @@ class NotificationBox(Box):
|
|||||||
return self.close_button
|
return self.close_button
|
||||||
|
|
||||||
def on_hover_enter(self, *args):
|
def on_hover_enter(self, *args):
|
||||||
container = getattr(self, '_container', None)
|
container = getattr(self, "_container", None)
|
||||||
if container:
|
if container:
|
||||||
container.pause_and_reset_all_timeouts()
|
container.pause_and_reset_all_timeouts()
|
||||||
|
|
||||||
def on_hover_leave(self, *args):
|
def on_hover_leave(self, *args):
|
||||||
container = getattr(self, '_container', None)
|
container = getattr(self, "_container", None)
|
||||||
if container:
|
if container:
|
||||||
container.resume_all_timeouts()
|
container.resume_all_timeouts()
|
||||||
|
|
||||||
@@ -282,14 +291,18 @@ class NotificationBox(Box):
|
|||||||
self._timeout_id = GLib.timeout_add(self.timeout_ms, self.close_notification)
|
self._timeout_id = GLib.timeout_add(self.timeout_ms, self.close_notification)
|
||||||
|
|
||||||
def stop_timeout(self):
|
def stop_timeout(self):
|
||||||
if hasattr(self, '_timeout_id') and self._timeout_id is not None:
|
if hasattr(self, "_timeout_id") and self._timeout_id is not None:
|
||||||
GLib.source_remove(self._timeout_id)
|
GLib.source_remove(self._timeout_id)
|
||||||
self._timeout_id = None
|
self._timeout_id = None
|
||||||
|
|
||||||
def close_notification(self):
|
def close_notification(self):
|
||||||
# Safety check: ensure _destroyed attribute exists
|
# Safety check: ensure _destroyed attribute exists
|
||||||
if not hasattr(self, '_destroyed'):
|
if not hasattr(self, "_destroyed"):
|
||||||
logger.warning(f"NotificationBox {getattr(self, 'uuid', 'unknown')} missing _destroyed attribute, skipping close")
|
logger.warning(
|
||||||
|
f"NotificationBox {
|
||||||
|
getattr(self, 'uuid', 'unknown')
|
||||||
|
} missing _destroyed attribute, skipping close"
|
||||||
|
)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if not self._destroyed:
|
if not self._destroyed:
|
||||||
@@ -313,12 +326,12 @@ class NotificationBox(Box):
|
|||||||
if (
|
if (
|
||||||
hasattr(self, "cached_image_path")
|
hasattr(self, "cached_image_path")
|
||||||
and self.cached_image_path
|
and self.cached_image_path
|
||||||
and (not getattr(self, '_is_history', False) or from_history_delete)
|
and (not getattr(self, "_is_history", False) or from_history_delete)
|
||||||
):
|
):
|
||||||
delete_cached_image(self.cached_image_path)
|
delete_cached_image(self.cached_image_path)
|
||||||
|
|
||||||
# Ensure _destroyed attribute exists before setting it
|
# Ensure _destroyed attribute exists before setting it
|
||||||
if hasattr(self, '_destroyed'):
|
if hasattr(self, "_destroyed"):
|
||||||
self._destroyed = True
|
self._destroyed = True
|
||||||
else:
|
else:
|
||||||
# If _destroyed doesn't exist, create it
|
# If _destroyed doesn't exist, create it
|
||||||
@@ -328,18 +341,17 @@ class NotificationBox(Box):
|
|||||||
super().destroy()
|
super().destroy()
|
||||||
|
|
||||||
def hover_button(self, button):
|
def hover_button(self, button):
|
||||||
container = getattr(self, '_container', None)
|
container = getattr(self, "_container", None)
|
||||||
if container:
|
if container:
|
||||||
container.pause_and_reset_all_timeouts()
|
container.pause_and_reset_all_timeouts()
|
||||||
|
|
||||||
def unhover_button(self, button):
|
def unhover_button(self, button):
|
||||||
container = getattr(self, '_container', None)
|
container = getattr(self, "_container", None)
|
||||||
if container:
|
if container:
|
||||||
container.resume_all_timeouts()
|
container.resume_all_timeouts()
|
||||||
|
|
||||||
|
|
||||||
class NotificationContainer(Box):
|
class NotificationContainer(Box):
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
notification_history_instance: NotificationHistory,
|
notification_history_instance: NotificationHistory,
|
||||||
@@ -439,7 +451,25 @@ class NotificationContainer(Box):
|
|||||||
notification.connect("closed", self.on_notification_closed)
|
notification.connect("closed", self.on_notification_closed)
|
||||||
|
|
||||||
app_name = notification.app_name
|
app_name = notification.app_name
|
||||||
if app_name in LIMITED_APPS:
|
if app_name in get_history_ignored_apps():
|
||||||
|
logger.info(
|
||||||
|
f"Ignoring notification from {app_name} as it is in the ignored list."
|
||||||
|
)
|
||||||
|
# Don't add to history, just show the notification and let it timeout normally
|
||||||
|
new_box.set_is_history(False)
|
||||||
|
# Continue with normal notification display but skip history logic
|
||||||
|
self.stack.add_named(new_box, str(id))
|
||||||
|
self.notifications.append(new_box)
|
||||||
|
self.current_index = len(self.notifications) - 1
|
||||||
|
self.stack.set_visible_child(new_box)
|
||||||
|
|
||||||
|
for notification_box in self.notifications:
|
||||||
|
notification_box.start_timeout()
|
||||||
|
self.main_revealer.show_all()
|
||||||
|
self.main_revealer.set_reveal_child(True)
|
||||||
|
self.update_navigation_buttons()
|
||||||
|
return
|
||||||
|
if app_name in get_limited_apps_history():
|
||||||
notification_history_instance.clear_history_for_app(app_name)
|
notification_history_instance.clear_history_for_app(app_name)
|
||||||
|
|
||||||
existing_notification_index = -1
|
existing_notification_index = -1
|
||||||
@@ -531,33 +561,41 @@ class NotificationContainer(Box):
|
|||||||
|
|
||||||
notification_history_instance = self.notification_history
|
notification_history_instance = self.notification_history
|
||||||
|
|
||||||
notif_box.set_is_history(True)
|
# Check if this notification should be ignored from history
|
||||||
notification_history_instance.add_notification(notif_box)
|
app_name = notification.app_name
|
||||||
notif_box.stop_timeout()
|
if app_name not in get_history_ignored_apps():
|
||||||
|
notif_box.set_is_history(True)
|
||||||
|
notification_history_instance.add_notification(notif_box)
|
||||||
|
|
||||||
if reason_str == "NotificationCloseReason.DISMISSED_BY_USER":
|
if reason_str == "NotificationCloseReason.DISMISSED_BY_USER":
|
||||||
logger.info(
|
logger.info(
|
||||||
f"User dismissed notification {
|
f"User dismissed notification {
|
||||||
notification.id
|
notification.id
|
||||||
}, but still added to history"
|
}, added to history"
|
||||||
)
|
)
|
||||||
elif (
|
elif (
|
||||||
reason_str == "NotificationCloseReason.EXPIRED"
|
reason_str == "NotificationCloseReason.EXPIRED"
|
||||||
or reason_str == "NotificationCloseReason.CLOSED"
|
or reason_str == "NotificationCloseReason.CLOSED"
|
||||||
or reason_str == "NotificationCloseReason.UNDEFINED"
|
or reason_str == "NotificationCloseReason.UNDEFINED"
|
||||||
):
|
):
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Notification {
|
f"Notification {
|
||||||
notification.id
|
notification.id
|
||||||
} closed automatically, added to history"
|
} closed automatically, added to history"
|
||||||
)
|
)
|
||||||
|
else:
|
||||||
|
logger.warning(
|
||||||
|
f"Unknown close reason: {reason_str} for notification {
|
||||||
|
notification.id
|
||||||
|
}. Still added to history."
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
logger.warning(
|
logger.info(
|
||||||
f"Unknown close reason: {reason_str} for notification {
|
f"Notification from {app_name} closed but not added to history (ignored app)"
|
||||||
notification.id
|
|
||||||
}. Still added to history."
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
notif_box.stop_timeout()
|
||||||
|
|
||||||
if len(self.notifications) == 1:
|
if len(self.notifications) == 1:
|
||||||
self._is_destroying = True
|
self._is_destroying = True
|
||||||
self.main_revealer.set_reveal_child(False)
|
self.main_revealer.set_reveal_child(False)
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ NOTIFICATION_IMAGE_PREFIX = "notification_"
|
|||||||
NOTIFICATION_IMAGE_SUFFIX = ".png"
|
NOTIFICATION_IMAGE_SUFFIX = ".png"
|
||||||
DEFAULT_NOTIFICATION_IMAGE_SIZE = 48
|
DEFAULT_NOTIFICATION_IMAGE_SIZE = 48
|
||||||
MAX_PERSISTENT_NOTIFICATIONS = 100
|
MAX_PERSISTENT_NOTIFICATIONS = 100
|
||||||
LIMITED_APPS = ["Spotify"]
|
|
||||||
|
|
||||||
# Global shared notification history instance
|
# Global shared notification history instance
|
||||||
_shared_notification_history = None
|
_shared_notification_history = None
|
||||||
|
|||||||
Reference in new issue
Block a user