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.c323
1 files changed, 22 insertions, 301 deletions
diff --git a/src/chat_session.c b/src/chat_session.c
index eae3f577..0def4da2 100644
--- a/src/chat_session.c
+++ b/src/chat_session.c
@@ -43,45 +43,20 @@
 #include "log.h"
 #include "xmpp/xmpp.h"
 
-#define PAUSED_TIMOUT 10.0
-#define INACTIVE_TIMOUT 30.0
-
-typedef enum {
-    CHAT_STATE_STARTED,
-    CHAT_STATE_ACTIVE,
-    CHAT_STATE_PAUSED,
-    CHAT_STATE_COMPOSING,
-    CHAT_STATE_INACTIVE,
-    CHAT_STATE_GONE
-} chat_state_t;
-
-typedef struct chat_session_t {
-    char *barejid;
-    char *resource;
-    gboolean send_states;
-    chat_state_t state;
-    GTimer *active_timer;
-    gboolean sent;
-} ChatSession;
-
 static GHashTable *sessions;
 
-static ChatSession*
+static void
 _chat_session_new(const char * const barejid, const char * const resource, gboolean send_states)
 {
+    assert(barejid != NULL);
+    assert(resource != NULL);
+
     ChatSession *new_session = malloc(sizeof(struct chat_session_t));
     new_session->barejid = strdup(barejid);
-    if (resource) {
-        new_session->resource = strdup(resource);
-    } else {
-        new_session->resource = NULL;
-    }
+    new_session->resource = strdup(resource);
     new_session->send_states = send_states;
-    new_session->state = CHAT_STATE_STARTED;
-    new_session->active_timer = g_timer_new();
-    new_session->sent = FALSE;
 
-    return new_session;
+    g_hash_table_insert(sessions, strdup(barejid), new_session);
 }
 
 static void
@@ -90,10 +65,6 @@ _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;
-        }
         free(session);
     }
 }
@@ -112,284 +83,34 @@ chat_sessions_clear(void)
         g_hash_table_remove_all(sessions);
 }
 
-gboolean
-chat_session_exists(const char * const barejid)
-{
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
-
-    return (session != NULL);
-}
-
-char*
-chat_session_get_resource(const char * const barejid)
-{
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
-    assert(session != NULL);
-
-    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, 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) {
-        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);
-        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;
-    }
-    if (send_states) {
-        g_string_append(log_msg, ", chat states supported");
-    } else {
-        g_string_append(log_msg, ", chat states not supported");
-    }
-
-    log_debug(log_msg->str);
-    g_string_free(log_msg, TRUE);
-}
-
-void
-chat_session_on_message_send(const char * const barejid)
-{
-    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;
-}
-
-void
-chat_session_on_window_close(const char * const barejid)
-{
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
-
-    if (session) {
-        if (prefs_get_boolean(PREF_STATES) && 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_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_offline(const char * const barejid, const char * const resource)
+ChatSession*
+chat_session_get(const char * const barejid)
 {
-    if (!resource) {
-        return;
-    }
-
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
-
-    if (session && (g_strcmp0(session->resource, resource) == 0)) {
-        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);
-    }
+    return g_hash_table_lookup(sessions, barejid);
 }
 
 void
-chat_session_on_gone(const char * const barejid)
+chat_session_on_recipient_activity(const char * const barejid, const char * const resource)
 {
     ChatSession *session = g_hash_table_lookup(sessions, barejid);
     if (session) {
-        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_activity(const char * const barejid)
-{
-    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_inactivity(const char * const barejid)
-{
-    ChatSession *session = g_hash_table_lookup(sessions, barejid);
-    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;
-
-        } else if (elapsed > PAUSED_TIMOUT) {
-            if (session->state == CHAT_STATE_COMPOSING) {
-                session->sent = FALSE;
-                session->state = CHAT_STATE_PAUSED;
-            }
-        }
-    }
-
-    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) {
-                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);
+        // session exists with resource, do nothing
+        if (g_strcmp0(session->resource, resource) == 0) {
+            return;
+        // session exists with differet resource, replace
+        } else {
             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;
+            _chat_session_new(barejid, resource, FALSE);
         }
-        g_string_free(jid, TRUE);
+
+    // no session, create one
+    } else {
+        _chat_session_new(barejid, resource, FALSE);
     }
 }
 
 void
-chat_session_on_cancel(const char * const jid)
+chat_session_remove(const char * const barejid)
 {
-    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);
-        }
-    }
+    g_hash_table_remove(sessions, barejid);
 }
\ No newline at end of file
'alt'>
28191d31 ^

b07576d2 ^

28191d31 ^
62ae069e ^
b07576d2 ^

62ae069e ^
b07576d2 ^
62ae069e ^

5eb5a8de ^

87eb3aca ^
5eb5a8de ^
4a48bedc ^
5eb5a8de ^
87eb3aca ^
62ae069e ^

f24eeaab ^
62ae069e ^
4a48bedc ^
62ae069e ^





f24eeaab ^
62ae069e ^



300a1d6e ^



4a48bedc ^
300a1d6e ^


























1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177