about summary refs log tree commit diff stats
path: root/src/chat_session.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/chat_session.c')
-rw-r--r--src/chat_session.c294
1 files changed, 206 insertions, 88 deletions
diff --git a/src/chat_session.c b/src/chat_session.c
index d27a3449..67104fa6 100644
--- a/src/chat_session.c
+++ b/src/chat_session.c
@@ -34,6 +34,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include <glib.h>
 
@@ -57,24 +58,30 @@ typedef enum {
 typedef struct chat_session_t {
     char *barejid;
     char *resource;
-    gboolean supported;
+    gboolean send_states;
     chat_state_t state;
     GTimer *active_timer;
     gboolean sent;
+    gboolean includes_message;
 } ChatSession;
 
 static GHashTable *sessions;
 
 static ChatSession*
-_chat_session_new(const char * const barejid, gboolean supported)
+_chat_session_new(const char * const barejid, const char * const resource, gboolean send_states)
 {
     ChatSession *new_session = malloc(sizeof(struct chat_session_t));
     new_session->barejid = strdup(barejid);
-    new_session->resource = NULL;
-    new_session->supported = supported;
+    if (resource) {
+        new_session->resource = strdup(resource);
+    } else {
+        new_session->resource = NULL;
+    }
+    new_session->send_states = send_states;
     new_session->state = CHAT_STATE_STARTED;
     new_session->active_timer = g_timer_new();
     new_session->sent = FALSE;
+    new_session->includes_message = FALSE;
 
     return new_session;
 }
@@ -84,6 +91,7 @@ _chat_session_free(ChatSession *session)
 {
     if (session != NULL) {
         free(session->barejid);
+        free(session->resource);
         if (session->active_timer != NULL) {
             g_timer_destroy(session->active_timer);
             session->active_timer = NULL;
@@ -107,137 +115,247 @@ chat_sessions_clear(void)
 }
 
 gboolean
-chat_session_on_message_send(const char * const barejid)
+chat_session_exists(const char * const barejid)
 {
-    gboolean send_state = FALSE;
-    if (prefs_get_boolean(PREF_STATES)) {
-        ChatSession *session = g_hash_table_lookup(sessions, barejid);
-        if (!session) {
-            session = _chat_session_new(barejid, TRUE);
-            g_hash_table_insert(sessions, strdup(barejid), session);
+    ChatSession *session = g_hash_table_lookup(sessions, barejid);
 
-        }
-        if (session->supported) {
-            session->state = CHAT_STATE_ACTIVE;
-            g_timer_start(session->active_timer);
-            session->sent = TRUE;
-            send_state = TRUE;
-        }
-    }
+    return (session != NULL);
+}
+
+char*
+chat_session_get_resource(const char * const barejid)
+{
+    ChatSession *session = g_hash_table_lookup(sessions, barejid);
+    assert(session != NULL);
 
-    return send_state;
+    return session->resource;
+}
+
+gboolean
+chat_session_send_states(const char * const barejid)
+{
+    ChatSession *session = g_hash_table_lookup(sessions, barejid);
+    assert(session != NULL);
+
+    return session->send_states;
 }
 
 void
-chat_session_on_incoming_message(const char * const barejid, gboolean supported)
+chat_session_on_incoming_message(const char * const barejid, const char * const resource, gboolean send_states)
 {
     ChatSession *session = g_hash_table_lookup(sessions, barejid);
+    GString *log_msg = g_string_new("");
+
+    // no session exists, create one
     if (!session) {
-        session = _chat_session_new(barejid, supported);
+        g_string_append(log_msg, "Creating chat session for ");
+        g_string_append(log_msg, barejid);
+        if (resource) {
+            g_string_append(log_msg, "/");
+            g_string_append(log_msg, resource);
+        }
+        session = _chat_session_new(barejid, resource, send_states);
+        g_hash_table_insert(sessions, strdup(barejid), session);
+
+    // session exists for different resource, replace session
+    } else if (g_strcmp0(session->resource, resource) != 0) {
+        g_string_append(log_msg, "Replacing chat session for ");
+        g_string_append(log_msg, barejid);
+        if (session->resource) {
+            g_string_append(log_msg, "/");
+            g_string_append(log_msg, session->resource);
+        }
+        g_string_append(log_msg, " with session for ");
+        g_string_append(log_msg, barejid);
+        if (resource) {
+            g_string_append(log_msg, "/");
+            g_string_append(log_msg, resource);
+        }
+        g_hash_table_remove(sessions, session);
+        session = _chat_session_new(barejid, resource, send_states);
+        session->includes_message = TRUE;
         g_hash_table_insert(sessions, strdup(barejid), session);
+
+    // session exists for resource, update state
+    } else {
+        g_string_append(log_msg, "Updating chat session for ");
+        g_string_append(log_msg, session->barejid);
+        if (session->resource) {
+            g_string_append(log_msg, "/");
+            g_string_append(log_msg, session->resource);
+        }
+        session->send_states = send_states;
+        session->includes_message = TRUE;
+    }
+    if (send_states) {
+        g_string_append(log_msg, ", chat states supported");
     } else {
-        session->supported = supported;
+        g_string_append(log_msg, ", chat states not supported");
     }
+
+    log_debug(log_msg->str);
+    g_string_free(log_msg, TRUE);
 }
 
 void
-chat_session_on_window_open(const char * const barejid)
+chat_session_on_message_send(const char * const barejid)
 {
-    if (prefs_get_boolean(PREF_STATES)) {
-        ChatSession *session = g_hash_table_lookup(sessions, barejid);
-        if (!session) {
-            session = _chat_session_new(barejid, TRUE);
-            g_hash_table_insert(sessions, strdup(barejid), session);
-        }
+    ChatSession *session = g_hash_table_lookup(sessions, barejid);
+
+    // if no session exists, create one with no resource, and send states
+    if (!session) {
+        log_debug("Creating chat session for %s, chat states supported", barejid);
+        session = _chat_session_new(barejid, NULL, TRUE);
+        g_hash_table_insert(sessions, strdup(barejid), session);
     }
+
+    session->state = CHAT_STATE_ACTIVE;
+    g_timer_start(session->active_timer);
+    session->sent = TRUE;
+    session->includes_message = TRUE;
 }
 
 void
 chat_session_on_window_close(const char * const barejid)
 {
-    if (prefs_get_boolean(PREF_STATES)) {
-        ChatSession *session = g_hash_table_lookup(sessions, barejid);
-        // send <gone/> chat state before closing
-        if (session->supported) {
-            session->state = CHAT_STATE_GONE;
-            message_send_gone(barejid);
-            session->sent = TRUE;
-            g_hash_table_remove(sessions, barejid);
+    ChatSession *session = g_hash_table_lookup(sessions, barejid);
+
+    if (session) {
+        if (prefs_get_boolean(PREF_STATES) && session->send_states && session->includes_message) {
+            GString *jid = g_string_new(session->barejid);
+            if (session->resource) {
+                g_string_append(jid, "/");
+                g_string_append(jid, session->resource);
+            }
+            message_send_gone(jid->str);
+            g_string_free(jid, TRUE);
+        }
+        GString *log_msg = g_string_new("Removing chat session for ");
+        g_string_append(log_msg, barejid);
+        if (session->resource) {
+            g_string_append(log_msg, "/");
+            g_string_append(log_msg, session->resource);
         }
+        log_debug(log_msg->str);
+        g_string_free(log_msg, TRUE);
+        g_hash_table_remove(sessions, barejid);
     }
 }
 
 void
-chat_session_on_cancel(const char * const jid)
+chat_session_on_activity(const char * const barejid)
 {
-    if (prefs_get_boolean(PREF_STATES)) {
-        ChatSession *session = g_hash_table_lookup(sessions, jid);
-        if (session) {
-            session->supported = FALSE;
+    ChatSession *session = g_hash_table_lookup(sessions, barejid);
+
+    if (!session) {
+        log_debug("Creating chat session for %s, chat states supported", barejid);
+        session = _chat_session_new(barejid, NULL, TRUE);
+        g_hash_table_insert(sessions, strdup(barejid), session);
+    }
+
+    if (session->state != CHAT_STATE_COMPOSING) {
+        session->sent = FALSE;
+    }
+
+    session->state = CHAT_STATE_COMPOSING;
+    g_timer_start(session->active_timer);
+
+    if (!session->sent || session->state == CHAT_STATE_PAUSED) {
+        if (prefs_get_boolean(PREF_STATES) && prefs_get_boolean(PREF_OUTTYPE) && session->send_states) {
+            GString *jid = g_string_new(session->barejid);
+            if (session->resource) {
+                g_string_append(jid, "/");
+                g_string_append(jid, session->resource);
+            }
+            message_send_composing(jid->str);
+            g_string_free(jid, TRUE);
         }
+        session->sent = TRUE;
     }
 }
 
 void
-chat_session_on_activity(const char * const barejid)
+chat_session_on_inactivity(const char * const barejid)
 {
     ChatSession *session = g_hash_table_lookup(sessions, barejid);
-    if (session) {
-        if (session->supported) {
-            if (session->state != CHAT_STATE_COMPOSING) {
+    if (!session) {
+        return;
+    }
+
+    if (session->active_timer != NULL) {
+        gdouble elapsed = g_timer_elapsed(session->active_timer, NULL);
+
+        if ((prefs_get_gone() != 0) && (elapsed > (prefs_get_gone() * 60.0))) {
+            if (session->state != CHAT_STATE_GONE) {
+                session->sent = FALSE;
+            }
+            session->state = CHAT_STATE_GONE;
+
+        } else if (elapsed > INACTIVE_TIMOUT) {
+            if (session->state != CHAT_STATE_INACTIVE) {
                 session->sent = FALSE;
             }
+            session->state = CHAT_STATE_INACTIVE;
 
-            session->state = CHAT_STATE_COMPOSING;
-            g_timer_start(session->active_timer);
+        } else if (elapsed > PAUSED_TIMOUT) {
+            if (session->state == CHAT_STATE_COMPOSING) {
+                session->sent = FALSE;
+                session->state = CHAT_STATE_PAUSED;
+            }
+        }
+    }
 
-            if (!session->sent || session->state == CHAT_STATE_PAUSED) {
-                message_send_composing(barejid);
-                session->sent = TRUE;
+    if (session->sent == FALSE) {
+        GString *jid = g_string_new(session->barejid);
+        if (session->resource) {
+            g_string_append(jid, "/");
+            g_string_append(jid, session->resource);
+        }
+        if (session->state == CHAT_STATE_GONE) {
+            if (prefs_get_boolean(PREF_STATES) && session->send_states && session->includes_message) {
+                message_send_gone(jid->str);
+            }
+            session->sent = TRUE;
+            GString *log_msg = g_string_new("Removing chat session for ");
+            g_string_append(log_msg, barejid);
+            if (session->resource) {
+                g_string_append(log_msg, "/");
+                g_string_append(log_msg, session->resource);
+            }
+            log_debug(log_msg->str);
+            g_string_free(log_msg, TRUE);
+            g_hash_table_remove(sessions, barejid);
+        } else if (session->state == CHAT_STATE_INACTIVE) {
+            if (prefs_get_boolean(PREF_STATES) && session->send_states) {
+                message_send_inactive(jid->str);
             }
+            session->sent = TRUE;
+        } else if (session->state == CHAT_STATE_PAUSED && prefs_get_boolean(PREF_OUTTYPE)) {
+            if (prefs_get_boolean(PREF_STATES) && session->send_states) {
+                message_send_paused(jid->str);
+            }
+            session->sent = TRUE;
         }
+        g_string_free(jid, TRUE);
     }
 }
 
 void
-chat_session_on_inactivity(const char * const barejid)
+chat_session_on_cancel(const char * const jid)
 {
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
-    if (session && session->supported) {
-        if (session->active_timer != NULL) {
-            gdouble elapsed = g_timer_elapsed(session->active_timer, NULL);
-
-            if ((prefs_get_gone() != 0) && (elapsed > (prefs_get_gone() * 60.0))) {
-                if (session->state != CHAT_STATE_GONE) {
-                    session->sent = FALSE;
-                }
-                session->state = CHAT_STATE_GONE;
-
-            } else if (elapsed > INACTIVE_TIMOUT) {
-                if (session->state != CHAT_STATE_INACTIVE) {
-                    session->sent = FALSE;
-                }
-                session->state = CHAT_STATE_INACTIVE;
-
-            } else if (elapsed > PAUSED_TIMOUT) {
-                if (session->state == CHAT_STATE_COMPOSING) {
-                    session->sent = FALSE;
-                    session->state = CHAT_STATE_PAUSED;
-                }
-            }
-        }
-
-        if (session->sent == FALSE) {
-            if (session->state == CHAT_STATE_GONE) {
-                message_send_gone(barejid);
-                session->sent = TRUE;
-            } else if (session->state == CHAT_STATE_INACTIVE) {
-                message_send_inactive(barejid);
-                session->sent = TRUE;
-            } else if (session->state == CHAT_STATE_PAUSED && prefs_get_boolean(PREF_OUTTYPE)) {
-                message_send_paused(barejid);
-                session->sent = TRUE;
+    Jid *jidp = jid_create(jid);
+    if (jidp) {
+        ChatSession *session = g_hash_table_lookup(sessions, jidp->barejid);
+        if (session) {
+            GString *log_msg = g_string_new("Removing chat session for ");
+            g_string_append(log_msg, jidp->barejid);
+            if (session->resource) {
+                g_string_append(log_msg, "/");
+                g_string_append(log_msg, session->resource);
             }
+            log_debug(log_msg->str);
+            g_string_free(log_msg, TRUE);
+            g_hash_table_remove(sessions, jidp->barejid);
         }
     }
 }
\ No newline at end of file
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-20 02:11:06 +0000