Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[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 4175771c48bd5bae1b1eaa3ad52c93228e1475d2..4c2d50ade321a9cdfe4ede9ef1d9de0bc5b5cb0f 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -67,6 +67,10 @@ void xmpp_indicate_presence(char *presence_jid)
 {
        char xmlbuf[256];
 
+<<<<<<< HEAD
+       syslog(LOG_DEBUG, "XMPP: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
+=======
+>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
        cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
        cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
 }
@@ -119,7 +123,7 @@ void xmpp_wholist_presence_dump(void)
  * Function to remove a buddy subscription and delete from the roster
  * (used in several places)
  */
-void xmpp_destroy_buddy(char *presence_jid) {
+void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
        static int unsolicited_id = 1;
        char xmlbuf1[256];
        char xmlbuf2[256];
@@ -133,10 +137,20 @@ void xmpp_destroy_buddy(char *presence_jid) {
                xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
                xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
        );
-       cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
-               xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
-               xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
-       );
+
+       /*
+        * Setting the "aggressively" flag also sends an "unsubscribed" presence update.
+        * We only ask for this when flushing the client side roster, because if we do it
+        * in the middle of a session when another user logs off, some clients (Jitsi) interpret
+        * it as a rejection of a subscription request.
+        */
+       if (aggressively) {
+               cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
+                       xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+                       xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
+               );
+       }
+
        // FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere
 
        /* Do an unsolicited roster update that deletes the contact. */
@@ -161,7 +175,7 @@ void xmpp_destroy_buddy(char *presence_jid) {
  */
 void xmpp_presence_notify(char *presence_jid, int event_type) {
        struct CitContext *cptr;
-       static int unsolicited_id;
+       static int unsolicited_id = 12345;
        int visible_sessions = 0;
        int nContexts, i;
        int which_cptr_is_relevant = (-1);
@@ -184,13 +198,11 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
                }
        }
 
-       syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
-               visible_sessions, presence_jid, CC->cs_pid);
+       syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n", visible_sessions, presence_jid, CC->cs_pid);
 
        if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
 
-               syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n",
-                       CC->cs_pid, presence_jid);
+               syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid);
 
                /* Do an unsolicited roster update that adds a new contact. */
                assert(which_cptr_is_relevant >= 0);
@@ -205,8 +217,8 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 
        if (visible_sessions == 0) {
                syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
-                       CC->cs_pid, presence_jid);
-               xmpp_destroy_buddy(presence_jid);
+                           CC->cs_pid, presence_jid);
+               xmpp_destroy_buddy(presence_jid, 0);    /* non aggressive presence update */
        }
 
        free(cptr);
@@ -228,12 +240,12 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
        /* now add anyone we find into the hashlist */
 
        /* skip past the headers */
-       ptr = strstr(msg->cm_fields['M'], "\n\n");
+       ptr = strstr(msg->cm_fields[eMesageText], "\n\n");
        if (ptr != NULL) {
                ptr += 2;
        }
        else {
-               ptr = strstr(msg->cm_fields['M'], "\n\r\n");
+               ptr = strstr(msg->cm_fields[eMesageText], "\n\r\n");
                if (ptr != NULL) {
                        ptr += 3;
                }
@@ -249,7 +261,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
                }
        }
 
-       CtdlFreeMessage(msg);
+       CM_Free(msg);
 }
 
 
@@ -391,7 +403,7 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
                }
 
                if (!online_now) {
-                       xmpp_destroy_buddy((char *)Value);
+                       xmpp_destroy_buddy((char *)Value, 1);   /* aggressive presence update */
                }
 
        }