1 files changed, 74 insertions, 26 deletions

diff --git a/libdino/src/service/notification_events.vala b/libdino/src/service/notification_events.vala
index f6ef7019..d1e55113 100644
--- a/libdino/src/service/notification_events.vala
+++ b/libdino/src/service/notification_events.vala
@@ -16,6 +16,7 @@ public class NotificationEvents : StreamInteractionModule, Object {
     public signal void notify_voice_request(Account account, Jid room_jid, Jid from_jid, string nick);
 
     private StreamInteractor stream_interactor;
+    private NotificationProvider? notifier;
 
     public static void start(StreamInteractor stream_interactor) {
         NotificationEvents m = new NotificationEvents(stream_interactor);
@@ -27,55 +28,102 @@ public class NotificationEvents : StreamInteractionModule, Object {
 
         stream_interactor.get_module(ContentItemStore.IDENTITY).new_item.connect(on_content_item_received);
         stream_interactor.get_module(PresenceManager.IDENTITY).received_subscription_request.connect(on_received_subscription_request);
-        stream_interactor.get_module(MucManager.IDENTITY).invite_received.connect((account, room_jid, from_jid, password, reason) => notify_muc_invite(account, room_jid, from_jid, password, reason));
-        stream_interactor.get_module(MucManager.IDENTITY).voice_request_received.connect((account, room_jid, from_jid, nick) => notify_voice_request(account, room_jid, from_jid, nick));
-        stream_interactor.connection_manager.connection_error.connect((account, error) => notify_connection_error(account, error));
+        stream_interactor.get_module(MucManager.IDENTITY).invite_received.connect(on_invite_received);
+        stream_interactor.get_module(MucManager.IDENTITY).voice_request_received.connect((account, room_jid, from_jid, nick) => {
+            Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(room_jid, account, Conversation.Type.GROUPCHAT);
+            if (conversation == null) return;
+            notifier.notify_voice_request.begin(conversation, from_jid);
+        });
+        stream_interactor.connection_manager.connection_error.connect((account, error) => notifier.notify_connection_error.begin(account, error));
+        stream_interactor.get_module(ChatInteraction.IDENTITY).focused_in.connect((conversation) => {
+            notifier.retract_content_item_notifications.begin();
+            notifier.retract_conversation_notifications.begin(conversation);
+        });
+    }
+
+    public void register_notification_provider(NotificationProvider notification_provider) {
+        if (notifier == null || notifier.get_priority() < notification_provider.get_priority()) {
+            notifier = notification_provider;
+        }
     }
 
     private void on_content_item_received(ContentItem item, Conversation conversation) {
         ContentItem last_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_latest(conversation);
 
-        if (item.id != last_item.id && last_item.id != conversation.read_up_to_item) return;
-
-        if (!should_notify(item, conversation)) return;
+        if (item.id != last_item.id) return;
+        if (item.id == conversation.read_up_to_item) return;
         if (stream_interactor.get_module(ChatInteraction.IDENTITY).is_active_focus()) return;
-        notify_content_item(item, conversation);
-    }
 
-    private bool should_notify(ContentItem content_item, Conversation conversation) {
         Conversation.NotifySetting notify = conversation.get_notification_setting(stream_interactor);
+        if (notify == Conversation.NotifySetting.OFF) return;
 
-        if (notify == Conversation.NotifySetting.OFF) return false;
+        string conversation_display_name = get_conversation_display_name(stream_interactor, conversation, null);
+        string? participant_display_name = null;
+        if (conversation.type_ == Conversation.Type.GROUPCHAT) {
+            participant_display_name = get_participant_display_name(stream_interactor, conversation, item.jid);
+        }
 
-        switch (content_item.type_) {
+        switch (item.type_) {
             case MessageItem.TYPE:
-                Message message = ((MessageItem) content_item).message;
-                if (message.direction == Message.DIRECTION_SENT) return false;
+                Message message = ((MessageItem) item).message;
+
+                if (message.direction == Message.DIRECTION_SENT) return;
+
+                if (notify == Conversation.NotifySetting.HIGHLIGHT) {
+                    Jid? nick = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account);
+                    if (nick == null) return;
+
+                    bool highlight = Regex.match_simple("\\b" + Regex.escape_string(nick.resourcepart) + "\\b", message.body, RegexCompileFlags.CASELESS);
+                    if (!highlight) return;
+                }
+
+                notifier.notify_message.begin(message, conversation, conversation_display_name, participant_display_name);
                 break;
             case FileItem.TYPE:
-                FileTransfer file_transfer = ((FileItem) content_item).file_transfer;
-                // Don't notify on file transfers in a groupchat set to "mention only"
-                if (notify == Conversation.NotifySetting.HIGHLIGHT) return false;
-                if (file_transfer.direction == FileTransfer.DIRECTION_SENT) return false;
-                break;
-        }
+                FileTransfer file_transfer = ((FileItem) item).file_transfer;
+                bool is_image = file_transfer.mime_type != null && file_transfer.mime_type.has_prefix("image");
 
-        if (content_item.type_ == MessageItem.TYPE && notify == Conversation.NotifySetting.HIGHLIGHT) {
-            Jid? nick = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account);
-            if (nick == null) return false;
+                // Don't notify on file transfers in a groupchat set to "mention only"
+                if (notify == Conversation.NotifySetting.HIGHLIGHT) return;
+                if (file_transfer.direction == FileTransfer.DIRECTION_SENT) return;
 
-            Entities.Message message = ((MessageItem) content_item).message;
-            return Regex.match_simple("\\b" + Regex.escape_string(nick.resourcepart) + "\\b", message.body, RegexCompileFlags.CASELESS);
+                notifier.notify_file.begin(file_transfer, conversation, is_image, conversation_display_name, participant_display_name);
+                break;
         }
-        return true;
     }
 
     private void on_received_subscription_request(Jid jid, Account account) {
         Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(jid, account, Conversation.Type.CHAT);
         if (stream_interactor.get_module(ChatInteraction.IDENTITY).is_active_focus(conversation)) return;
 
-        notify_subscription_request(conversation);
+        notifier.notify_subscription_request.begin(conversation);
     }
+
+    private void on_invite_received(Account account, Jid room_jid, Jid from_jid, string? password, string? reason) {
+        string inviter_display_name;
+        if (room_jid.equals_bare(from_jid)) {
+            Conversation conversation = new Conversation(room_jid, account, Conversation.Type.GROUPCHAT);
+            inviter_display_name = get_participant_display_name(stream_interactor, conversation, from_jid);
+        } else {
+            Conversation direct_conversation = new Conversation(from_jid, account, Conversation.Type.CHAT);
+            inviter_display_name = get_participant_display_name(stream_interactor, direct_conversation, from_jid);
+        }
+        notifier.notify_muc_invite.begin(account, room_jid, from_jid, inviter_display_name);
+    }
+}
+
+public interface NotificationProvider : Object {
+    public abstract double get_priority();
+
+    public abstract async void notify_message(Message message, Conversation conversation, string conversation_display_name, string? participant_display_name);
+    public abstract async void notify_file(FileTransfer file_transfer, Conversation conversation, bool is_image, string conversation_display_name, string? participant_display_name);
+    public abstract async void notify_subscription_request(Conversation conversation);
+    public abstract async void notify_connection_error(Account account, ConnectionManager.ConnectionError error);
+    public abstract async void notify_muc_invite(Account account, Jid room_jid, Jid from_jid, string inviter_display_name);
+    public abstract async void notify_voice_request(Conversation conversation, Jid from_jid);
+
+    public abstract async void retract_content_item_notifications();
+    public abstract async void retract_conversation_notifications(Conversation conversation);
 }
 
 }