diff options
| -rw-r--r-- | libdino/src/service/entity_info.vala | 3 | ||||
| -rw-r--r-- | xmpp-vala/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xmpp-vala/src/module/xep/0030_service_discovery/flag.vala | 6 | ||||
| -rw-r--r-- | xmpp-vala/src/module/xep/0030_service_discovery/module.vala | 1 | ||||
| -rw-r--r-- | xmpp-vala/src/module/xep/0115_entity_capabilities.vala (renamed from xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala) | 0 |
5 files changed, 3 insertions, 9 deletions
diff --git a/libdino/src/service/entity_info.vala b/libdino/src/service/entity_info.vala index 7a78b154..7eed2583 100644 --- a/libdino/src/service/entity_info.vala +++ b/libdino/src/service/entity_info.vala @@ -97,7 +97,8 @@ public class EntityInfo : StreamInteractionModule, Object { string? caps_hash = EntityCapabilities.get_caps_hash(presence); if (caps_hash == null) return; - /*db.entity.upsert() + /* TODO check might_be_groupchat before storing + db.entity.upsert() .value(db.entity.account_id, account.id, true) .value(db.entity.jid_id, db.get_jid_id(presence.from), true) .value(db.entity.resource, presence.from.resourcepart, true) diff --git a/xmpp-vala/CMakeLists.txt b/xmpp-vala/CMakeLists.txt index f2e89b4e..94c7f75b 100644 --- a/xmpp-vala/CMakeLists.txt +++ b/xmpp-vala/CMakeLists.txt @@ -74,7 +74,7 @@ SOURCES "src/module/xep/0082_date_time_profiles.vala" "src/module/xep/0084_user_avatars.vala" "src/module/xep/0085_chat_state_notifications.vala" - "src/module/xep/0115_entitiy_capabilities.vala" + "src/module/xep/0115_entity_capabilities.vala" "src/module/xep/0166_jingle.vala" "src/module/xep/0184_message_delivery_receipts.vala" "src/module/xep/0191_blocking_command.vala" diff --git a/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala b/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala index ab311727..67729f5d 100644 --- a/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala +++ b/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala @@ -5,8 +5,6 @@ namespace Xmpp.Xep.ServiceDiscovery { public class Flag : XmppStreamFlag { public static FlagIdentity<Flag> IDENTITY = new FlagIdentity<Flag>(NS_URI, "service_discovery"); - private HashMap<Jid, Gee.List<Item>?> entity_items = new HashMap<Jid, Gee.List<Item>?>(Jid.hash_func, Jid.equals_func); - private Gee.Set<string> own_features_ = new HashSet<string>(); public Gee.List<string> own_features { owned get { @@ -21,10 +19,6 @@ public class Flag : XmppStreamFlag { owned get { return own_identities_.read_only_view; } } - public void set_entity_items(Jid jid, Gee.List<Item>? features) { - entity_items[jid] = features; - } - public void add_own_feature(string feature) { if (own_features_.contains(feature)) { warning("Tried to add the feature %s a second time".printf(feature)); 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 c61d3ab0..0b573a13 100644 --- a/xmpp-vala/src/module/xep/0030_service_discovery/module.vala +++ b/xmpp-vala/src/module/xep/0030_service_discovery/module.vala @@ -80,7 +80,6 @@ public class Module : XmppStreamModule, Iq.Handler { Iq.Stanza iq_result = yield stream.get_module(Iq.Module.IDENTITY).send_iq_async(stream, iq); ItemsResult? result = ItemsResult.create_from_iq(iq_result); - stream.get_flag(Flag.IDENTITY).set_entity_items(iq_result.from, result != null ? result.items : null); return result; } diff --git a/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala b/xmpp-vala/src/module/xep/0115_entity_capabilities.vala index 8e15e0c2..8e15e0c2 100644 --- a/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala +++ b/xmpp-vala/src/module/xep/0115_entity_capabilities.vala |