anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Small notification fixes (#1077)

Browse source
This commit is contained in:
sojuz151 2021-09-22 15:51:54 +02:00 committed by GitHub
parent 93e2e0d1cf
commit 1cf10ebdf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main/src/ui/notifier_freedesktop.vala
View file

@ -10,6 +10,7 @@ public class Dino.Ui.FreeDesktopNotifier : NotificationProvider, Object {
private StreamInteractor stream_interactor; private StreamInteractor stream_interactor;
private DBusNotifications dbus_notifications; private DBusNotifications dbus_notifications;
private bool supports_body_markup = false; private bool supports_body_markup = false;
private bool supports_body_hyperlinks = false;
private HashMap<Conversation, uint32> content_notifications = new HashMap<Conversation, uint32>(Conversation.hash_func, Conversation.equals_func); private HashMap<Conversation, uint32> content_notifications = new HashMap<Conversation, uint32>(Conversation.hash_func, Conversation.equals_func);
private HashMap<Conversation, Gee.List<uint32>> conversation_notifications = new HashMap<Conversation, Gee.List<uint32>>(Conversation.hash_func, Conversation.equals_func); private HashMap<Conversation, Gee.List<uint32>> conversation_notifications = new HashMap<Conversation, Gee.List<uint32>>(Conversation.hash_func, Conversation.equals_func);
@ -31,6 +32,9 @@ public class Dino.Ui.FreeDesktopNotifier : NotificationProvider, Object {
case "body-markup": case "body-markup":
supports_body_markup = true; supports_body_markup = true;
break; break;
case "body-hyperlinks":
supports_body_hyperlinks = true;
break;
} }
} }
@ -65,7 +69,14 @@ public class Dino.Ui.FreeDesktopNotifier : NotificationProvider, Object {
} }
public async void notify_message(Message message, Conversation conversation, string conversation_display_name, string? participant_display_name) { public async void notify_message(Message message, Conversation conversation, string conversation_display_name, string? participant_display_name) {
string body = supports_body_markup ? Markup.escape_text(message.body) : message.body; string body = "";
if (supports_body_hyperlinks) {
body = Util.parse_add_markup(message.body, null, true, false);
} else if (supports_body_markup) {
body = Markup.escape_text(message.body);
} else {
body = message.body;
}
yield notify_content_item(conversation, conversation_display_name, participant_display_name, body); yield notify_content_item(conversation, conversation_display_name, participant_display_name, body);
} }
@ -119,6 +130,7 @@ public class Dino.Ui.FreeDesktopNotifier : NotificationProvider, Object {
hash_table["image-path"] = "call-start-symbolic"; hash_table["image-path"] = "call-start-symbolic";
hash_table["sound-name"] = new Variant.string("phone-incoming-call"); hash_table["sound-name"] = new Variant.string("phone-incoming-call");
hash_table["urgency"] = new Variant.byte(2); hash_table["urgency"] = new Variant.byte(2);
hash_table["desktop-entry"] = new Variant.string(Dino.Application.get_default().get_application_id());
string[] actions = new string[] {"default", "Open conversation", "reject", _("Reject"), "accept", _("Accept")}; string[] actions = new string[] {"default", "Open conversation", "reject", _("Reject"), "accept", _("Accept")};
try { try {
uint32 notification_id = dbus_notifications.notify("Dino", 0, "", summary, body, actions, hash_table, 0); uint32 notification_id = dbus_notifications.notify("Dino", 0, "", summary, body, actions, hash_table, 0);