From fa3a77958a8ecdd8e9e4e4b375b8084e55dca765 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 27 Feb 2025 19:32:24 +0100 Subject: Fix subscription-missing notification appearing in self-chat --- main/src/ui/conversation_content_view/subscription_notification.vala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/src/ui/conversation_content_view/subscription_notification.vala b/main/src/ui/conversation_content_view/subscription_notification.vala index 7fdda0b3..00d6cdbb 100644 --- a/main/src/ui/conversation_content_view/subscription_notification.vala +++ b/main/src/ui/conversation_content_view/subscription_notification.vala @@ -30,8 +30,11 @@ public class SubscriptionNotitication : Object { if (conversation.type_ != Conversation.Type.CHAT) return; if (stream_interactor.get_module(PresenceManager.IDENTITY).exists_subscription_request(conversation.account, conversation.counterpart)) { + // Show a notification of a pending subscription request show_pending_subscription_request(); - } else { + } else if (!conversation.counterpart.equals_bare(conversation.account.bare_jid)) { + // Show a suggestion to request subscription if: We don't have subscription yet and didn't yet request it + // Don't show this notification for chats with ourselves var roster_item = stream_interactor.get_module(RosterManager.IDENTITY).get_roster_item(conversation.account, conversation.counterpart); if (roster_item == null || (roster_item.subscription == Xmpp.Roster.Item.SUBSCRIPTION_NONE || roster_item.subscription == Xmpp.Roster.Item.SUBSCRIPTION_FROM) && -- cgit v1.3