anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
fiaxh 2020-09-03 22:52:07 +02:00
parent 49bcbdaa51
commit 2d31d9d470
5 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libdino/src/service/entity_info.vala
View file

@ -97,7 +97,8 @@ public class EntityInfo : StreamInteractionModule, Object {
string? caps_hash = EntityCapabilities.get_caps_hash(presence); string? caps_hash = EntityCapabilities.get_caps_hash(presence);
if (caps_hash == null) return; 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.account_id, account.id, true)
.value(db.entity.jid_id, db.get_jid_id(presence.from), true) .value(db.entity.jid_id, db.get_jid_id(presence.from), true)
.value(db.entity.resource, presence.from.resourcepart, true) .value(db.entity.resource, presence.from.resourcepart, true)

2
xmpp-vala/CMakeLists.txt
View file

@ -74,7 +74,7 @@ SOURCES
"src/module/xep/0082_date_time_profiles.vala" "src/module/xep/0082_date_time_profiles.vala"
"src/module/xep/0084_user_avatars.vala" "src/module/xep/0084_user_avatars.vala"
"src/module/xep/0085_chat_state_notifications.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/0166_jingle.vala"
"src/module/xep/0184_message_delivery_receipts.vala" "src/module/xep/0184_message_delivery_receipts.vala"
"src/module/xep/0191_blocking_command.vala" "src/module/xep/0191_blocking_command.vala"

6
xmpp-vala/src/module/xep/0030_service_discovery/flag.vala
View file

@ -5,8 +5,6 @@ namespace Xmpp.Xep.ServiceDiscovery {
public class Flag : XmppStreamFlag { public class Flag : XmppStreamFlag {
public static FlagIdentity<Flag> IDENTITY = new FlagIdentity<Flag>(NS_URI, "service_discovery"); 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>(); private Gee.Set<string> own_features_ = new HashSet<string>();
public Gee.List<string> own_features { public Gee.List<string> own_features {
owned get { owned get {
@ -21,10 +19,6 @@ public class Flag : XmppStreamFlag {
owned get { return own_identities_.read_only_view; } 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) { public void add_own_feature(string feature) {
if (own_features_.contains(feature)) { if (own_features_.contains(feature)) {
warning("Tried to add the feature %s a second time".printf(feature)); warning("Tried to add the feature %s a second time".printf(feature));

1
xmpp-vala/src/module/xep/0030_service_discovery/module.vala
View file

@ -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); Iq.Stanza iq_result = yield stream.get_module(Iq.Module.IDENTITY).send_iq_async(stream, iq);
ItemsResult? result = ItemsResult.create_from_iq(iq_result); 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; return result;
} }

0
xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala → xmpp-vala/src/module/xep/0115_entity_capabilities.vala
View file