From e159fd2492c28c1ef4ab64828ca0e8c2de877b41 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 3 Jul 2020 21:14:39 +0200 Subject: Only query entity caps when we need them --- .../module/xep/0030_service_discovery/module.vala | 28 +++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'xmpp-vala/src/module/xep/0030_service_discovery/module.vala') diff --git a/xmpp-vala/src/module/xep/0030_service_discovery/module.vala b/xmpp-vala/src/module/xep/0030_service_discovery/module.vala index f21146f1..c61d3ab0 100644 --- a/xmpp-vala/src/module/xep/0030_service_discovery/module.vala +++ b/xmpp-vala/src/module/xep/0030_service_discovery/module.vala @@ -12,9 +12,10 @@ public class Module : XmppStreamModule, Iq.Handler { private HashMap> active_info_requests = new HashMap>(Jid.hash_func, Jid.equals_func); public Identity own_identity; + public CapsCache cache; public Module.with_identity(string category, string type, string? name = null) { - own_identity = new Identity(category, type, name); + this.own_identity = new Identity(category, type, name); } public void add_feature(XmppStream stream, string feature) { @@ -42,27 +43,11 @@ public class Module : XmppStreamModule, Iq.Handler { } public async bool has_entity_feature(XmppStream stream, Jid jid, string feature) { - Flag flag = stream.get_flag(Flag.IDENTITY); - - if (flag.has_entity_feature(jid, feature) == null) { - InfoResult? info_result = yield request_info(stream, jid); - stream.get_flag(Flag.IDENTITY).set_entity_features(jid, info_result != null ? info_result.features : null); - stream.get_flag(Flag.IDENTITY).set_entity_identities(jid, info_result != null ? info_result.identities : null); - } - - return flag.has_entity_feature(jid, feature) ?? false; + return yield this.cache.has_entity_feature(jid, feature); } public async Gee.Set? get_entity_identities(XmppStream stream, Jid jid) { - Flag flag = stream.get_flag(Flag.IDENTITY); - - if (flag.get_entity_identities(jid) == null) { - InfoResult? info_result = yield request_info(stream, jid); - stream.get_flag(Flag.IDENTITY).set_entity_features(info_result.iq.from, info_result != null ? info_result.features : null); - stream.get_flag(Flag.IDENTITY).set_entity_identities(info_result.iq.from, info_result != null ? info_result.identities : null); - } - - return flag.get_entity_identities(jid); + return yield this.cache.get_entity_identities(jid); } public async InfoResult? request_info(XmppStream stream, Jid jid) { @@ -137,4 +122,9 @@ public class Module : XmppStreamModule, Iq.Handler { } } +public interface CapsCache : Object { + public abstract async bool has_entity_feature(Jid jid, string feature); + public abstract async Gee.Set get_entity_identities(Jid jid); +} + } -- cgit v1.2.3-54-g00ecf