4 files changed, 45 insertions, 23 deletions

diff --git a/libdino/src/service/chat_interaction.vala b/libdino/src/service/chat_interaction.vala
index 1e988382..def9ea86 100644
--- a/libdino/src/service/chat_interaction.vala
+++ b/libdino/src/service/chat_interaction.vala
@@ -51,6 +51,24 @@ public class ChatInteraction : StreamInteractionModule, Object {
         return (int) query.count();
     }
 
+    public async void mark_all_as_read() {
+        ContentItemStore content_item_store = stream_interactor.get_module(ContentItemStore.IDENTITY);
+        CounterpartInteractionManager counterpart_interaction_manager = stream_interactor.get_module(CounterpartInteractionManager.IDENTITY);
+
+        foreach (Conversation conversation in stream_interactor.get_module(ConversationManager.IDENTITY).get_active_conversations()) {
+            if (get_num_unread(conversation) == 0) continue;
+
+            ContentItem? latest_item = content_item_store.get_latest(conversation);
+            if (latest_item == null) continue;
+
+            Message? message = content_item_store.get_message_for_content_item(conversation, latest_item);
+            if (message != null) {
+                yield send_and_mark_message_displayed(conversation, message);
+            }
+            counterpart_interaction_manager.mark_displayed_up_to_content_item(conversation, latest_item);
+        }
+    }
+
     public bool is_active_focus(Conversation? conversation = null) {
         if (conversation != null) {
             return focus_in && conversation.equals(this.selected_conversation);
diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala
index 2ebddd92..afae1da8 100644
--- a/libdino/src/service/connection_manager.vala
+++ b/libdino/src/service/connection_manager.vala
@@ -384,6 +384,9 @@ public class ConnectionManager : Object {
     }
 
     public static bool on_invalid_certificate(string domain, TlsCertificate peer_cert, TlsCertificateFlags errors) {
+        if (Application.ignore_tls_errors) {
+            return true;
+        }
         if (domain.has_suffix(".onion") && errors == TlsCertificateFlags.UNKNOWN_CA) {
             // It's barely possible for .onion servers to provide a non-self-signed cert.
             // But that's fine because encryption is provided independently though TOR.
diff --git a/libdino/src/service/message_correction.vala b/libdino/src/service/message_correction.vala
index 55d121e2..5f04bdbc 100644
--- a/libdino/src/service/message_correction.vala
+++ b/libdino/src/service/message_correction.vala
@@ -59,22 +59,7 @@ public class MessageCorrection : StreamInteractionModule, MessageListener {
     }
 
     public bool is_own_correction_allowed(Conversation conversation, Message message) {
-        string stanza_id = message.edit_to ?? message.stanza_id;
-
-        Jid? own_jid = null;
-        if (conversation.type_ == Conversation.Type.CHAT) {
-            own_jid = stream_interactor.get_account_full_jid(conversation.account);
-            if (own_jid == null) return false;
-            Message other = stream_interactor.get_module(MessageStorage.IDENTITY).get_last_message_by_sent_resource(conversation, own_jid.resourcepart);
-            return other != null && other.id == message.id;
-        } else if (conversation.type_ == Conversation.Type.GROUPCHAT) {
-            own_jid = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account);
-            if (own_jid == null) return false;
-            return last_messages.has_key(conversation) &&
-                    last_messages[conversation].has_key(own_jid) &&
-                    last_messages[conversation][own_jid].stanza_id == stanza_id;
-        }
-        return false;
+        return message.direction == Message.DIRECTION_SENT;
     }
 
     private void check_add_correction_node(Entities.Message message, Xmpp.MessageStanza message_stanza, Conversation conversation) {
diff --git a/libdino/src/service/notification_events.vala b/libdino/src/service/notification_events.vala
index 3e077dfc..d22d54a4 100644
--- a/libdino/src/service/notification_events.vala
+++ b/libdino/src/service/notification_events.vala
@@ -7,6 +7,7 @@ namespace Dino {
 
 public class NotificationEvents : StreamInteractionModule, Object {
     public static ModuleIdentity<NotificationEvents> IDENTITY = new ModuleIdentity<NotificationEvents>("notification_events");
+    private const int MESSAGE_NOTIFICATION_MAX_AGE_SECONDS = 15;
     public string id { get { return IDENTITY.id; } }
 
     public signal void notify_content_item(ContentItem content_item, Conversation conversation);
@@ -52,9 +53,6 @@ public class NotificationEvents : StreamInteractionModule, Object {
         if (item.id == conversation.read_up_to_item) return;
         if (stream_interactor.get_module(ChatInteraction.IDENTITY).is_active_focus()) return;
 
-        Conversation.NotifySetting notify = conversation.get_notification_setting(stream_interactor);
-        if (notify == Conversation.NotifySetting.OFF) return;
-
         string conversation_display_name = get_conversation_display_name(stream_interactor, conversation, null);
         string? participant_display_name = null;
         if (conversation.type_ == Conversation.Type.GROUPCHAT) {
@@ -63,11 +61,16 @@ public class NotificationEvents : StreamInteractionModule, Object {
 
         switch (item.type_) {
             case MessageItem.TYPE:
+                Conversation.NotifySetting message_notify = conversation.get_notification_setting(stream_interactor);
+                if (message_notify == Conversation.NotifySetting.OFF) return;
+
                 Message message = ((MessageItem) item).message;
 
                 if (message.direction == Message.DIRECTION_SENT) return;
+                DateTime? message_time = message.time;
+                if (message_time != null && message_time.compare(new DateTime.now_utc().add_seconds(-MESSAGE_NOTIFICATION_MAX_AGE_SECONDS)) < 0) return;
 
-                if (notify == Conversation.NotifySetting.HIGHLIGHT) {
+                if (message_notify == Conversation.NotifySetting.HIGHLIGHT) {
                     Jid? nick = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account);
                     if (nick == null) return;
 
@@ -76,21 +79,25 @@ public class NotificationEvents : StreamInteractionModule, Object {
                 }
 
                 notify_content_item(item, conversation);
-                if (notify != Conversation.NotifySetting.OFF) {
+                if (message_notify != Conversation.NotifySetting.OFF) {
                     NotificationProvider notifier = yield notifier.wait_async();
                     yield notifier.notify_message(message, conversation, conversation_display_name, participant_display_name);
                 }
                 break;
             case FileItem.TYPE:
+                Conversation.NotifySetting file_notify = conversation.get_notification_setting_for(
+                        stream_interactor, Application.get_default().settings.notifications_files);
+                if (file_notify == Conversation.NotifySetting.OFF) return;
+
                 FileTransfer file_transfer = ((FileItem) item).file_transfer;
                 bool is_image = file_transfer.content_type != null && file_transfer.content_type.is_image();
 
                 // Don't notify on file transfers in a groupchat set to "mention only"
-                if (notify == Conversation.NotifySetting.HIGHLIGHT) return;
+                if (file_notify == Conversation.NotifySetting.HIGHLIGHT) return;
                 if (file_transfer.direction == FileTransfer.DIRECTION_SENT) return;
 
                 notify_content_item(item, conversation);
-                if (notify != Conversation.NotifySetting.OFF) {
+                if (file_notify != Conversation.NotifySetting.OFF) {
                     NotificationProvider notifier = yield notifier.wait_async();
                     yield notifier.notify_file(file_transfer, conversation, is_image, conversation_display_name, participant_display_name);
                 }
@@ -102,6 +109,8 @@ public class NotificationEvents : StreamInteractionModule, Object {
     }
 
     private async void on_voice_request_received(Account account, Jid room_jid, Jid from_jid, string nick) {
+        if (!Application.get_default().settings.notifications_permission_requests) return;
+
         Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(room_jid, account, Conversation.Type.GROUPCHAT);
         if (conversation == null) return;
 
@@ -110,6 +119,8 @@ public class NotificationEvents : StreamInteractionModule, Object {
     }
 
     private async void on_received_subscription_request(Jid jid, Account account) {
+        if (!Application.get_default().settings.notifications_subscription_requests) return;
+
         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;
 
@@ -118,6 +129,7 @@ public class NotificationEvents : StreamInteractionModule, Object {
     }
 
     private async void on_call_incoming(Call call, CallState call_state, Conversation conversation, bool video, bool multiparty) {
+        if (!Application.get_default().settings.notifications_calls) return;
         if (!stream_interactor.get_module(Calls.IDENTITY).can_we_do_calls(call.account)) return;
         string conversation_display_name = get_conversation_display_name(stream_interactor, conversation, null);
 
@@ -131,6 +143,8 @@ public class NotificationEvents : StreamInteractionModule, Object {
     }
 
     private async void on_invite_received(Account account, Jid room_jid, Jid from_jid, string? password, string? reason) {
+        if (!Application.get_default().settings.notifications_group_chat_invitations) return;
+
         string inviter_display_name;
         if (room_jid.equals_bare(from_jid)) {
             Conversation conversation = new Conversation(room_jid, account, Conversation.Type.GROUPCHAT);
@@ -144,6 +158,8 @@ public class NotificationEvents : StreamInteractionModule, Object {
     }
 
     private async void on_connection_error(Account account, ConnectionManager.ConnectionError error) {
+        if (!Application.get_default().settings.notifications_connection_errors) return;
+
         NotificationProvider notifier = yield notifier.wait_async();
         yield notifier.notify_connection_error(account, error);
     }