stable now but there are GIANT PIECES MISSING

[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 2d498078422a5dc11b4ed7cb10a21e7d6b249676..00fb4e3bd77534c9ee48bbea95bf814def457fee 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -1,7 +1,7 @@
 /*
  * Handle XMPP presence exchanges
  *
- * Copyright (c) 2007-2017 by Art Cancro and citadel.org
+ * Copyright (c) 2007-2021 by Art Cancro and citadel.org
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,18 +29,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <assert.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -53,18 +42,15 @@
 #include "support.h"
 #include "config.h"
 #include "internet_addressing.h"
-#include "md5.h"
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
 
-
 /* 
  * Indicate the presence of another user to the client
  * (used in several places)
  */
-void xmpp_indicate_presence(char *presence_jid)
-{
+void xmpp_indicate_presence(char *presence_jid) {
        char xmlbuf[256];
 
        syslog(LOG_DEBUG, "xmpp: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
@@ -73,7 +59,6 @@ void xmpp_indicate_presence(char *presence_jid)
 }
 
 
-
 /*
  * Convenience function to determine whether any given session is 'visible' to any other given session,
  * and is capable of receiving instant messages from that session.
@@ -97,8 +82,7 @@ int xmpp_is_visible(struct CitContext *cptr, struct CitContext *to_whom) {
 /* 
  * Initial dump of the entire wholist
  */
-void xmpp_wholist_presence_dump(void)
-{
+void xmpp_wholist_presence_dump(void) {
        struct CitContext *cptr = NULL;
        int nContexts, i;
        
@@ -109,7 +93,7 @@ void xmpp_wholist_presence_dump(void)
 
        for (i=0; i<nContexts; i++) {
                if (xmpp_is_visible(&cptr[i], CC)) {
-                       xmpp_indicate_presence(cptr[i].cs_inet_email);
+                       xmpp_indicate_presence(cptr[i].cs_principal_id);
                }
        }
        free(cptr);
@@ -152,7 +136,7 @@ void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
 
        /* Do an unsolicited roster update that deletes the contact. */
        cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
-               xmlesc(xmlbuf1, CC->cs_inet_email, sizeof xmlbuf1),
+               xmlesc(xmlbuf1, CC->cs_principal_id, sizeof xmlbuf1),
                xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2),
                ++unsolicited_id
        );
@@ -187,7 +171,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 
        /* Count the visible sessions for this user */
        for (i=0; i<nContexts; i++) {
-               if ( (!strcasecmp(cptr[i].cs_inet_email, presence_jid))
+               if ( (!strcasecmp(cptr[i].cs_principal_id, presence_jid))
                   && (xmpp_is_visible(&cptr[i], CC))
                )  {
                        ++visible_sessions;
@@ -221,14 +205,13 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 }
 
 
-
 void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
        HashList *mortuary = (HashList *) userdata;
        struct CtdlMessage *msg;
        char *ptr = NULL;
        char *lasts = NULL;
 
-       msg = CtdlFetchMessage(msgnum, 1, 1);
+       msg = CtdlFetchMessage(msgnum, 1);
        if (msg == NULL) {
                return;
        }
@@ -261,7 +244,6 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 }
 
 
-
 /*
  * 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
@@ -284,7 +266,6 @@ HashList *xmpp_fetch_mortuary(void) {
 }
 
 
-
 /*
  * 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
@@ -303,8 +284,7 @@ void xmpp_store_mortuary(HashList *mortuary) {
        );
 
        HashPos = GetNewHashPos(mortuary, 0);
-       while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0)
-       {
+       while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0) {
                StrBufAppendPrintf(themsg, "%s\n", (char *)Value);
        }
        DeleteHashPos(&HashPos);
@@ -313,12 +293,11 @@ void xmpp_store_mortuary(HashList *mortuary) {
        CtdlDeleteMessages(USERCONFIGROOM, NULL, 0, XMPPMORTUARY);
 
        /* And save the new one to disk */
-       quickie_message("Citadel", NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
+       quickie_message(CC->user.fullname, NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
        FreeStrBuf(&themsg);
 }
 
 
-
 /*
  * 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.
@@ -326,8 +305,7 @@ void xmpp_store_mortuary(HashList *mortuary) {
  * 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)
-{
+void xmpp_massacre_roster(void) {
        struct CitContext *cptr;
        int nContexts, i;
        HashList *mortuary = xmpp_fetch_mortuary();
@@ -337,7 +315,7 @@ void xmpp_massacre_roster(void)
                for (i=0; i<nContexts; i++) {
                        if (xmpp_is_visible(&cptr[i], CC)) {
                                if (mortuary) {
-                                       char *buddy = strdup(cptr[i].cs_inet_email);
+                                       char *buddy = strdup(cptr[i].cs_principal_id);
                                        Put(mortuary, buddy, strlen(buddy), buddy, NULL);
                                }
                        }
@@ -352,7 +330,6 @@ void xmpp_massacre_roster(void)
 }
 
 
-
 /*
  * Stupidly, XMPP does not specify a way to tell the client to flush its client-side roster
  * and prepare to receive a new one.  So instead we remember every buddy we've ever told the
@@ -363,8 +340,7 @@ void xmpp_massacre_roster(void)
  * when they're connecting from the same client and when they're connecting from a different client,
  * so we have no guarantee of what is in the client side roster at connect time.
  */
-void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
-{
+void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) {
        long len;
        void *Value;
        const char *Key;
@@ -384,7 +360,7 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
                online_now = 0;
                if (cptr) for (i=0; i<nContexts; i++) {
                        if (xmpp_is_visible(&cptr[i], CC)) {
-                               if (!strcasecmp(cptr[i].cs_inet_email, (char *)Value)) {
+                               if (!strcasecmp(cptr[i].cs_principal_id, (char *)Value)) {
                                        online_now = 1;
                                }
                        }
@@ -399,4 +375,3 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
        DeleteHash(&mortuary);
        free(cptr);
 }
-