X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/e5847c3ef379e4e5a3c0ecfc5ddd60628f446050..084af78f05c50cce8e2bf0805d85c544784787b9:/src/client.c

diff --git a/src/client.c b/src/client.c
index e94e393..32f950a 100644
--- 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);
@@ -1699,12 +1697,8 @@ make_server(struct Client *client_p)
 void
 free_user(struct User *user, struct Client *client_p)
 {
-	free_away(client_p);
-
 	if(--user->refcnt <= 0)
 	{
-		if(user->away)
-			rb_free((char *) user->away);
 		/*
 		 * sanity check
 		 */
@@ -1731,21 +1725,21 @@ free_user(struct User *user, struct Client *client_p)
 	}
 }
 
-void
-allocate_away(struct Client *client_p)
+const char *
+get_metadata(struct Client *client_p, const char *key)
 {
-	if(client_p->user->away == NULL)
-		client_p->user->away = rb_bh_alloc(away_heap);	
-}
+	struct MetadataEntry *md;
 
+	if (client_p->user != NULL)
+	{
+		md = irc_dictionary_retrieve(client_p->user->metadata, key);
+		if (md == NULL)
+			return NULL;
 
-void
-free_away(struct Client *client_p)
-{
-	if(client_p->user != NULL && client_p->user->away != NULL) {
-		rb_bh_free(away_heap, client_p->user->away);
-		client_p->user->away = NULL;
+		return md->value;
 	}
+
+	return NULL;
 }
 
 void
@@ -1755,12 +1749,22 @@ set_metadata(struct Client *client_p, const char *key, const char *value)
 
 	if(client_p->user != NULL)
 	{
-		md = rb_bh_alloc(metadata_heap);
-		rb_strlcpy(md->key, key, NICKLEN);
-		rb_strlcpy(md->value, value, TOPICLEN);
+		md = irc_dictionary_retrieve(client_p->user->metadata, key);
+		if (md == NULL)
+		{
+			md = rb_bh_alloc(metadata_heap);
+			rb_strlcpy(md->key, key, NICKLEN);
+			irc_dictionary_add(client_p->user->metadata, md->key, md);
+		}
+		else if (!strcmp(md->key, key) && !strcmp(md->value, value))
+			return;
+		else
+			rb_strlcpy(md->key, key, NICKLEN);
 
-		irc_dictionary_add(client_p->user->metadata, key, md);
+		rb_strlcpy(md->value, value, TOPICLEN);
 	}
+
+	sendto_common_channels_local_with_capability(client_p, CLICAP_PRESENCE, form_str(RPL_METADATACHG), me.name, client_p->name, key, value);
 }
 
 void
@@ -1774,8 +1778,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