presence: send..._with_capability...(): don't send if the client does not have the...

[irc/rqf/shadowircd.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index eb3110d6326fe77e5ada97cb4cbf1a165d2828cd..5cee85867cb2f6074de948a072bbcb8324ececdf 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -76,7 +76,6 @@ static rb_bh *client_heap = NULL;
 static rb_bh *lclient_heap = NULL;
 static rb_bh *pclient_heap = NULL;
 static rb_bh *user_heap = NULL;
-static rb_bh *away_heap = NULL;
 static rb_bh *metadata_heap = NULL;
 static char current_uid[IDLEN];
 
@@ -122,7 +121,6 @@ init_client(void)
        pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE, "pclient_heap");
        user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
        metadata_heap = rb_bh_create(sizeof(struct MetadataEntry), USER_HEAP_SIZE, "metadata_heap");
-       away_heap = rb_bh_create(AWAYLEN, AWAY_HEAP_SIZE, "away_heap");
 
        rb_event_addish("check_pings", check_pings, NULL, 30);
        rb_event_addish("free_exited_clients", &free_exited_clients, NULL, 4);
@@ -1701,8 +1699,6 @@ free_user(struct User *user, struct Client *client_p)
 {
        if(--user->refcnt <= 0)
        {
-               if(user->away)
-                       rb_free((char *) user->away);
                /*
                 * sanity check
                 */
@@ -1751,14 +1747,17 @@ set_metadata(struct Client *client_p, const char *key, const char *value)
 {
        struct MetadataEntry *md;
 
+       delete_metadata(client_p, key);
        if(client_p->user != NULL)
        {
                md = rb_bh_alloc(metadata_heap);
                rb_strlcpy(md->key, key, NICKLEN);
                rb_strlcpy(md->value, value, TOPICLEN);
 
-               irc_dictionary_add(client_p->user->metadata, key, md);
+               irc_dictionary_add(client_p->user->metadata, md->key, md);
        }
+
+       sendto_common_channels_local_with_capability(client_p, CLICAP_PRESENCE, form_str(RPL_METADATACHG), me.name, client_p->name, key, value);
 }
 
 void
@@ -1772,8 +1771,10 @@ delete_metadata(struct Client *client_p, const char *key)
                if (md == NULL)
                        return;
 
-               rb_free(md);
+               rb_bh_free(metadata_heap, md);
        }
+
+       sendto_common_channels_local_with_capability(client_p, CLICAP_PRESENCE, form_str(RPL_METADATACHG), me.name, client_p->name, key, "");
 }
 
 void