aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

xep-0084: use hash table for avatar lookup

Browse Source
This commit is contained in:
Michael Vetter 2020-01-22 11:28:01 +01:00
parent 802df37926
commit d4c27f2f78
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xmpp/avatar.c
View File

@ -54,7 +54,7 @@ typedef struct avatar_metadata {
char *id; char *id;
} avatar_metadata; } avatar_metadata;
char *looking_for = NULL; // nick/barejid from who we want to get the avatar GHashTable *looking_for = NULL; // contains nicks/barejids from who we want to get the avatar
static void _avatar_request_item_by_id(const char *jid, avatar_metadata *data); static void _avatar_request_item_by_id(const char *jid, avatar_metadata *data);
static int _avatar_metadata_handler(xmpp_stanza_t *const stanza, void *const userdata); static int _avatar_metadata_handler(xmpp_stanza_t *const stanza, void *const userdata);
@ -76,6 +76,11 @@ avatar_pep_subscribe(void)
message_pubsub_event_handler_add(STANZA_NS_USER_AVATAR_DATA, _avatar_metadata_handler, NULL, NULL); message_pubsub_event_handler_add(STANZA_NS_USER_AVATAR_DATA, _avatar_metadata_handler, NULL, NULL);
//caps_add_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY); //caps_add_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY);
if (looking_for) {
g_hash_table_destroy(looking_for);
}
looking_for = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
} }
gboolean gboolean
@ -83,9 +88,9 @@ avatar_get_by_nick(const char* nick)
{ {
// in case we set the feature, remove it // in case we set the feature, remove it
caps_remove_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY); caps_remove_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY);
free(looking_for);
looking_for = strdup(nick); // save nick in list so we look for this one
g_hash_table_insert(looking_for, strdup(nick), NULL);
// add the feature. this will trigger the _avatar_metadata_notfication_handler handler // add the feature. this will trigger the _avatar_metadata_notfication_handler handler
caps_add_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY); caps_add_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY);
@ -98,8 +103,7 @@ _avatar_metadata_handler(xmpp_stanza_t *const stanza, void *const userdata)
{ {
const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if (!(looking_for && if (!g_hash_table_contains(looking_for, from)) {
(g_strcmp0(looking_for, from) == 0))) {
return 1; return 1;
} }
@ -171,11 +175,10 @@ _avatar_request_item_result_handler(xmpp_stanza_t *const stanza, void *const use
return 1; return 1;
} }
if (g_strcmp0(from_attr, looking_for) != 0) { if (!g_hash_table_contains(looking_for, from_attr)) {
return 1; return 1;
} }
free(looking_for); g_hash_table_remove(looking_for, from_attr);
looking_for = NULL;
xmpp_stanza_t *pubsub = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_PUBSUB); xmpp_stanza_t *pubsub = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_PUBSUB);
if (!pubsub) { if (!pubsub) {