diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chat_session.c | 112 | ||||
| -rw-r--r-- | src/chat_session.h | 38 | ||||
| -rw-r--r-- | src/jabber.c | 20 | ||||
| -rw-r--r-- | src/profanity.c | 2 |
4 files changed, 167 insertions, 5 deletions
diff --git a/src/chat_session.c b/src/chat_session.c new file mode 100644 index 00000000..283860de --- /dev/null +++ b/src/chat_session.c @@ -0,0 +1,112 @@ +/* + * chat_session.c + * + * Copyright (C) 2012 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdlib.h> +#include <string.h> + +#include <glib.h> + +#include "chat_session.h" +#include "log.h" + +static ChatSession _chat_session_new(const char * const recipient, + gboolean recipient_supports); +static void _chat_session_free(ChatSession session); + +struct chat_session_t { + char *recipient; + gboolean recipient_supports; +}; + +static GHashTable *sessions; + +void +chat_sessions_init(void) +{ + sessions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, + (GDestroyNotify)_chat_session_free); +} + +void +chat_sessions_clear(void) +{ + g_hash_table_remove_all(sessions); +} + +gboolean +chat_session_exists(const char * const recipient) +{ + ChatSession session = g_hash_table_lookup(sessions, recipient); + + if (session != NULL) { + return TRUE; + } else { + return FALSE; + } +} + +void +chat_session_start(const char * const recipient, gboolean recipient_supports) +{ + char *key = strdup(recipient); + ChatSession session = _chat_session_new(key, recipient_supports); + g_hash_table_insert(sessions, key, session); +} + +void +chat_session_end(const char * const recipient) +{ + g_hash_table_remove(sessions, recipient); +} + +gboolean +chat_session_recipient_supports(const char * const recipient) +{ + ChatSession session = g_hash_table_lookup(sessions, recipient); + + if (session == NULL) { + log_error("No chat session found for %s.", recipient); + return FALSE; + } else { + return session->recipient_supports; + } +} + +static ChatSession +_chat_session_new(const char * const recipient, gboolean recipient_supports) +{ + ChatSession new_session = malloc(sizeof(struct chat_session_t)); + new_session->recipient = strdup(recipient); + new_session->recipient_supports = recipient_supports; + + return new_session; +} + +static void +_chat_session_free(ChatSession session) +{ + if (session != NULL) { + g_free(session->recipient); + g_free(session); + } + session = NULL; +} diff --git a/src/chat_session.h b/src/chat_session.h new file mode 100644 index 00000000..7cfc8de5 --- /dev/null +++ b/src/chat_session.h @@ -0,0 +1,38 @@ +/* + * chat_session.h + * + * Copyright (C) 2012 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef CHAT_SESSION_H +#define CHAT_SESSION_H + +#include <glib.h> + +typedef struct chat_session_t *ChatSession; + +void chat_sessions_init(void); +void chat_sessions_clear(void); +void chat_session_start(const char * const recipient, + gboolean recipient_supports); +gboolean chat_session_exists(const char * const recipient); +void chat_session_end(const char * const recipient); +gboolean chat_session_recipient_supports(const char * const recipient); + +#endif diff --git a/src/jabber.c b/src/jabber.c index 8c9c9ba0..23f7f444 100644 --- a/src/jabber.c +++ b/src/jabber.c @@ -25,6 +25,7 @@ #include <strophe.h> +#include "chat_session.h" #include "common.h" #include "contact_list.h" #include "jabber.h" @@ -136,16 +137,16 @@ jabber_process_events(void) void jabber_send(const char * const msg, const char * const recipient) { + if (!chat_session_exists(recipient)) { + chat_session_start(recipient, TRUE); + } + char *coded_msg = str_replace(msg, "&", "&"); char *coded_msg2 = str_replace(coded_msg, "<", "<"); char *coded_msg3 = str_replace(coded_msg2, ">", ">"); xmpp_stanza_t *reply, *body, *text, *active; - active = xmpp_stanza_new(jabber_conn.ctx); - xmpp_stanza_set_name(active, "active"); - xmpp_stanza_set_ns(active, "http://jabber.org/protocol/chatstates"); - reply = xmpp_stanza_new(jabber_conn.ctx); xmpp_stanza_set_name(reply, "message"); xmpp_stanza_set_type(reply, "chat"); @@ -156,7 +157,14 @@ jabber_send(const char * const msg, const char * const recipient) text = xmpp_stanza_new(jabber_conn.ctx); xmpp_stanza_set_text(text, coded_msg3); - xmpp_stanza_add_child(reply, active); + + if (chat_session_recipient_supports(recipient)) { + active = xmpp_stanza_new(jabber_conn.ctx); + xmpp_stanza_set_name(active, "active"); + xmpp_stanza_set_ns(active, "http://jabber.org/protocol/chatstates"); + xmpp_stanza_add_child(reply, active); + } + xmpp_stanza_add_child(body, text); xmpp_stanza_add_child(reply, body); @@ -244,6 +252,7 @@ jabber_get_jid(void) void jabber_free_resources(void) { + chat_sessions_clear(); xmpp_conn_release(jabber_conn.conn); xmpp_ctx_free(jabber_conn.ctx); xmpp_shutdown(); @@ -335,6 +344,7 @@ _connection_handler(xmpp_conn_t * const conn, if (status == XMPP_CONN_CONNECT) { const char *jid = xmpp_conn_get_jid(conn); prof_handle_login_success(jid); + chat_sessions_init(); xmpp_handler_add(conn, _message_handler, NULL, "message", NULL, ctx); xmpp_handler_add(conn, _presence_handler, NULL, "presence", NULL, ctx); diff --git a/src/profanity.c b/src/profanity.c index e4888e97..885c55ea 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -87,6 +87,8 @@ prof_run(const int disable_tls, char *log_level) inp[size++] = '\0'; cmd_result = _process_input(inp); } + + g_timer_destroy(timer); } void |