* clean up dead buddies from the xmpp roster (not finished yet)

[citadel.git] / citadel / modules / xmpp / xmpp_presence.c

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 9eaf88728e7eae30ed3dc4c67281d8da8fe68733..1a4cda0482c3f5e0fd8f534b25bd73063b144083 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -59,6 +59,20 @@
 #include "serv_xmpp.h"
 
 
+
+/* 
+ * Indicate the presence of another user to the client
+ * (used in several places)
+ */
+void xmpp_indicate_presence(char *presence_jid)
+{
+       cprintf("<presence from=\"%s\" to=\"%s\"></presence>",
+               presence_jid,
+               XMPP->client_jid
+       );
+}
+
+
 /* 
  * Initial dump of the entire wholist
  */
@@ -67,7 +81,7 @@ void xmpp_wholist_presence_dump(void)
        struct CitContext *cptr = NULL;
        int nContexts, i;
        
-       int aide = (CC->user.axlevel >= 6);
+       int aide = (CC->user.axlevel >= AxAideU);
 
        cptr = CtdlGetContextArray(&nContexts);
        if (!cptr) {
@@ -81,8 +95,7 @@ void xmpp_wholist_presence_dump(void)
                                && (cptr[i].user.usernum != CC->user.usernum)   /* don't show myself */
                                && (cptr[i].can_receive_im)                     /* IM-capable session */
                        ) {
-                               cprintf("<presence type=\"available\" from=\"%s\"></presence>",
-                                       cptr[i].cs_inet_email);
+                               xmpp_indicate_presence(cptr[i].cs_inet_email);
                        }
                }
        }
@@ -98,11 +111,20 @@ void xmpp_destroy_buddy(char *presence_jid) {
        static int unsolicited_id = 1;
 
        /* Transmit non-presence information */
-       cprintf("<presence type=\"unavailable\" from=\"%s\"></presence>", presence_jid);
-       cprintf("<presence type=\"unsubscribed\" from=\"%s\"></presence>", presence_jid);
+       cprintf("<presence type=\"unavailable\" from=\"%s\" to=\"%s\"></presence>",
+               presence_jid, XMPP->client_jid
+       );
+       cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
+               presence_jid, XMPP->client_jid
+       );
+       // FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere
 
        /* Do an unsolicited roster update that deletes the contact. */
-       cprintf("<iq id=\"unbuddy_%x\" type=\"result\">", ++unsolicited_id);
+       cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
+               CC->cs_inet_email,
+               XMPP->client_jid,
+               ++unsolicited_id
+       );
        cprintf("<query xmlns=\"jabber:iq:roster\">");
        cprintf("<item jid=\"%s\" subscription=\"remove\">", presence_jid);
        cprintf("<group>%s</group>", config.c_humannode);
@@ -121,7 +143,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
        static int unsolicited_id;
        int visible_sessions = 0;
        int nContexts, i;
-       int aide = (CC->user.axlevel >= 6);
+       int aide = (CC->user.axlevel >= AxAideU);
 
        if (IsEmptyStr(presence_jid)) return;
        if (CC->kill_me) return;
@@ -166,7 +188,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
                }
 
                /* Transmit presence information */
-               cprintf("<presence type=\"available\" from=\"%s\"></presence>", presence_jid);
+               xmpp_indicate_presence(presence_jid);
        }
 
        if (visible_sessions == 0) {
@@ -178,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 >= 6);
+       int aide = (CC->user.axlevel >= AxAideU);
+       HashList *mortuary = xmpp_fetch_mortuary();
 
        cptr = CtdlGetContextArray(&nContexts);
        if (cptr) {
@@ -198,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);
+       }
 }