Removed chat states from chat_session module, WIP
This commit is contained in:
James Booth
@@ -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*
|
||||
chat_session_get(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;
|
||||
return g_hash_table_lookup(sessions, barejid);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
Reference in New Issue
Block a user