ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Desktop notifications: Fix limited HTML markup in the body text being rendered as HTML on some Linux systems

Browse source 
Fix #7671
This commit is contained in:
Kovid Goyal 2024-07-27 21:19:46 +05:30
parent 54b328710b
commit 45a3a655a7
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/desktop-notifications.rst
View file

@ -56,7 +56,8 @@ longer than ``2048`` bytes, *before being encoded*.
Both the ``title`` and ``body`` payloads must be either UTF-8 encoded plain
text with no embedded escape codes, or UTF-8 text that is :rfc:`base64 <4648>`
encoded, in which case there must be an ``e=1`` key in the metadata to indicate
the payload is :rfc:`base64 <4648>` encoded.
the payload is :rfc:`base64 <4648>` encoded. No HTML or other markup in the
plain text is allowed. It is strictly plain text, to be interpreted as such.
Being informed when user activates the notification
-------------------------------------------------------

12
kitty/notifications.py
View file

@ -369,7 +369,6 @@ def notify(self,
timeout: int = -1,
application: str = 'kitty',
icon_name: str = '', icon_path: str = '',
subtitle: Optional[str] = None,
urgency: Urgency = Urgency.Normal,
) -> int:
raise NotImplementedError('Implement me in subclass')
@ -408,15 +407,18 @@ def notify(self,
timeout: int = -1,
application: str = 'kitty',
icon_name: str = '', icon_path: str = '',
subtitle: Optional[str] = None,
urgency: Urgency = Urgency.Normal,
) -> int:
desktop_notification_id = next(self.id_counter)
from .fast_data_types import cocoa_send_notification
# If the body is not set macos makes the title the body and uses
# "kitty" as the title. So use a single space for the body in this
# case.
cocoa_send_notification(str(desktop_notification_id), title, body or ' ', subtitle, urgency.value)
# case. Although https://developer.apple.com/documentation/usernotifications/unnotificationcontent/body?language=objc
# says printf style strings are stripped this doesnt actually happen,
# so dont double %
# for %% escaping.
body = (body or ' ')
cocoa_send_notification(str(desktop_notification_id), title, body, '', urgency.value)
return desktop_notification_id
def notification_activated(self, event: str, ident: str) -> None:
@ -491,11 +493,11 @@ def notify(self,
timeout: int = -1,
application: str = 'kitty',
icon_name: str = '', icon_path: str = '',
subtitle: Optional[str] = None,
urgency: Urgency = Urgency.Normal,
) -> int:
from .fast_data_types import dbus_send_notification
app_icon = icon_name or icon_path or get_custom_window_icon()[1] or logo_png_file
body = body.replace('<', '<\u200c') # prevent HTML tags from being recognized
desktop_notification_id = dbus_send_notification(
app_name=application, app_icon=app_icon, title=title, body=body, timeout=timeout, urgency=urgency.value)
if debug_desktop_integration: