From 50c55c7f55aff6622d242bdcf2b58d5f7956f28e Mon Sep 17 00:00:00 2001 From: fiaxh Date: Wed, 10 Jun 2020 19:53:56 +0200 Subject: Fetch avatars only when they are used --- libdino/src/service/muc_manager.vala | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'libdino/src/service/muc_manager.vala') diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala index 3b6d9b5f..95fb2f8b 100644 --- a/libdino/src/service/muc_manager.vala +++ b/libdino/src/service/muc_manager.vala @@ -21,9 +21,11 @@ public class MucManager : StreamInteractionModule, Object { public signal void conference_removed(Account account, Jid jid); private StreamInteractor stream_interactor; + private HashMap> mucs_joining = new HashMap>(Account.hash_func, Account.equals_func); private HashMap enter_errors = new HashMap(Jid.hash_func, Jid.equals_func); private ReceivedMessageListener received_message_listener; private HashMap bookmarks_provider = new HashMap(Account.hash_func, Account.equals_func); + public static void start(StreamInteractor stream_interactor) { MucManager m = new MucManager(stream_interactor); stream_interactor.add_module(m); @@ -45,6 +47,7 @@ public class MucManager : StreamInteractionModule, Object { public async Muc.JoinResult? join(Account account, Jid jid, string? nick, string? password) { XmppStream? stream = stream_interactor.get_stream(account); if (stream == null) return null; + string nick_ = (nick ?? account.localpart) ?? account.domainpart; DateTime? history_since = null; @@ -54,8 +57,15 @@ public class MucManager : StreamInteractionModule, Object { if (last_message != null) history_since = last_message.time; } + if (!mucs_joining.has_key(account)) { + mucs_joining[account] = new ArrayList(); + } + mucs_joining[account].add(jid); + Muc.JoinResult? res = yield stream.get_module(Xep.Muc.Module.IDENTITY).enter(stream, jid.bare_jid, nick_, password, history_since); + mucs_joining[account].remove(jid); + if (res.nick != null) { // Join completed enter_errors.unset(jid); @@ -213,6 +223,11 @@ public class MucManager : StreamInteractionModule, Object { return !jid.is_full() && conversation != null; } + public bool might_be_groupchat(Jid jid, Account account) { + if (mucs_joining.has_key(account) && mucs_joining[account].contains(jid)) return true; + return is_groupchat(jid, account); + } + public bool is_groupchat_occupant(Jid jid, Account account) { return is_groupchat(jid.bare_jid, account) && jid.resourcepart != null; } -- cgit v1.3