From 7e2c4b5b3ba6175db95d9e567c7310e938c34a9f Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sun, 21 Mar 2010 04:40:39 +0000
Subject: [PATCH] * clean up dead buddies from the xmpp roster (not finished
 yet)

---
 citadel/citadel.h                    |  1 +
 citadel/modules/xmpp/xmpp_presence.c | 50 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/citadel/citadel.h b/citadel/citadel.h
index b1eafb267..9de0743d4 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -281,6 +281,7 @@ enum {
 #define IGNETMAP	"application/x-citadel-ignet-map"
 #define FILTERLIST	"application/x-citadel-filter-list"
 #define SIEVECONFIG	"application/x-citadel-sieve-config"
+#define XMPPMORTUARY	"application/x-citadel-xmpp-mortuary"
 
 #define TRACE	CtdlLogPrintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 915f1d319..1a4cda048 100644
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -200,16 +200,56 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 }
 
 
+/*
+ * Fetch the "mortuary" - a list of dead buddies which we keep around forever
+ * so we can remove them from any client's roster that still has them listed
+ */
+HashList *xmpp_fetch_mortuary(void) {
+	HashList *mortuary = NewHash(1, NULL);
+	if (!mortuary) {
+		CtdlLogPrintf(CTDL_ALERT, "NewHash() failed!\n");
+		return(NULL);
+	}
+
+	return(mortuary);
+}
+
+
+
+/*
+ * Fetch the "mortuary" - a list of dead buddies which we keep around forever
+ * so we can remove them from any client's roster that still has them listed
+ */
+void xmpp_store_mortuary(HashList *mortuary) {
+	HashPos *HashPos;
+	long len;
+	void *Value;
+	const char *Key;
+
+	HashPos = GetNewHashPos(mortuary, 0);
+	while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0)
+	{
+		CtdlLogPrintf(CTDL_DEBUG, "FIXME WRITE \033[31m%s\033[0m\n", (char *)Value);
+		/* note: don't free(Value) -- deleting the hash list will handle this for us */
+	}
+	DeleteHashPos(&HashPos);
+}
+
+
 
 /*
  * Upon logout we make an attempt to delete the whole roster, in order to
  * try to keep "ghost" buddies from remaining in the client-side roster.
+ *
+ * Since the client is probably not still alive, also remember the current
+ * roster for next time so we can delete dead buddies then.
  */
 void xmpp_massacre_roster(void)
 {
 	struct CitContext *cptr;
 	int nContexts, i;
 	int aide = (CC->user.axlevel >= AxAideU);
+	HashList *mortuary = xmpp_fetch_mortuary();
 
 	cptr = CtdlGetContextArray(&nContexts);
 	if (cptr) {
@@ -220,11 +260,21 @@ void xmpp_massacre_roster(void)
 			   		&& (cptr[i].user.usernum != CC->user.usernum)
 			   	) {
 					xmpp_destroy_buddy(cptr[i].cs_inet_email);
+					if (mortuary) {
+						char *buddy = strdup(cptr[i].cs_inet_email);
+						Put(mortuary, buddy, strlen(buddy),
+							buddy, generic_free_handler);
+					}
 				}
 			}
 		}
 		free (cptr);
 	}
+
+	if (mortuary) {
+		xmpp_store_mortuary(mortuary);
+		DeleteHash(&mortuary);
+	}
 }
 
 
-- 
2.30.2