diff options
author | James Booth <boothj5@gmail.com> | 2013-08-05 21:20:07 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2013-08-05 21:20:07 +0100 |
commit | 55282e063dacfa041083d878c69c7d37b0e36ed7 (patch) | |
tree | 94254c00afa21fee08364d8f40190288b3a4fd27 /src | |
parent | e170965c93ae838f3eff00f7558de5186268dd8b (diff) | |
download | profani-tty-55282e063dacfa041083d878c69c7d37b0e36ed7.tar.gz |
Handle when servers dont send status 101 or jid for MUC nick changes
Diffstat (limited to 'src')
-rw-r--r-- | src/muc.c | 16 | ||||
-rw-r--r-- | src/muc.h | 3 | ||||
-rw-r--r-- | src/xmpp/presence.c | 8 | ||||
-rw-r--r-- | src/xmpp/stanza.c | 59 | ||||
-rw-r--r-- | src/xmpp/stanza.h | 2 |
5 files changed, 72 insertions, 16 deletions
diff --git a/src/muc.c b/src/muc.c index 464d3e1b..89391ddd 100644 --- a/src/muc.c +++ b/src/muc.c @@ -167,17 +167,30 @@ muc_room_is_active(Jid *jid) } } +char * +muc_get_old_nick(const char * const room, const char * const new_nick) +{ + ChatRoom *chat_room = g_hash_table_lookup(rooms, room); + + if ((chat_room != NULL) && (chat_room->pending_nick_change)) { + return g_hash_table_lookup(chat_room->nick_changes, new_nick); + } + + return NULL; +} + /* * Flag that the user has sent a nick change to the service * and is awaiting the response */ void -muc_set_room_pending_nick_change(const char * const room) +muc_set_room_pending_nick_change(const char * const room, const char * const new_nick) { ChatRoom *chat_room = g_hash_table_lookup(rooms, room); if (chat_room != NULL) { chat_room->pending_nick_change = TRUE; + g_hash_table_insert(chat_room->nick_changes, strdup(new_nick), strdup(chat_room->nick)); } } @@ -210,6 +223,7 @@ muc_complete_room_nick_change(const char * const room, const char * const nick) free(chat_room->nick); chat_room->nick = strdup(nick); chat_room->pending_nick_change = FALSE; + g_hash_table_remove(chat_room->nick_changes, nick); } } diff --git a/src/muc.h b/src/muc.h index b0458378..3d12452e 100644 --- a/src/muc.h +++ b/src/muc.h @@ -36,10 +36,11 @@ gboolean muc_room_is_active(Jid *jid); GList* muc_get_active_room_list(void); char * muc_get_room_nick(const char * const room); -void muc_set_room_pending_nick_change(const char * const room); +void muc_set_room_pending_nick_change(const char * const room, const char * const new_nick); gboolean muc_is_room_pending_nick_change(const char * const room); void muc_complete_room_nick_change(const char * const room, const char * const nick); +char * muc_get_old_nick(const char * const room, const char * const new_nick); gboolean muc_add_to_roster(const char * const room, const char * const nick, const char * const show, const char * const status, diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index f072196d..63462a56 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -567,13 +567,13 @@ _room_presence_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, // handle self presence if (stanza_is_muc_self_presence(stanza, jabber_get_fulljid())) { char *type = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TYPE); - gboolean nick_change = stanza_is_room_nick_change(stanza); + char *new_nick = stanza_is_room_nick_change(stanza); if ((type != NULL) && (strcmp(type, STANZA_TYPE_UNAVAILABLE) == 0)) { // leave room if not self nick change - if (nick_change) { - muc_set_room_pending_nick_change(room); + if (new_nick != NULL) { + muc_set_room_pending_nick_change(room, new_nick); } else { prof_handle_leave_room(room); } @@ -606,7 +606,7 @@ _room_presence_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, if ((type != NULL) && (strcmp(type, STANZA_TYPE_UNAVAILABLE) == 0)) { // handle nickname change - if (stanza_is_room_nick_change(stanza)) { + if (stanza_is_room_nick_change(stanza) != NULL) { char *new_nick = stanza_get_new_nick(stanza); muc_set_roster_pending_nick_change(room, new_nick, nick); } else { diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c index 2e2f9858..c03aa398 100644 --- a/src/xmpp/stanza.c +++ b/src/xmpp/stanza.c @@ -31,6 +31,8 @@ #include "xmpp/stanza.h" #include "xmpp/capabilities.h" +#include "muc.h" + static int _field_compare(FormField *f1, FormField *f2); xmpp_stanza_t * @@ -508,50 +510,89 @@ stanza_is_muc_self_presence(xmpp_stanza_t * const stanza, x_children = xmpp_stanza_get_next(x_children); } + // for servers that don't send status 110 or Jid property + char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); + if (from != NULL) { + Jid *jidp = jid_create(from); + if (muc_room_is_active(jidp)) { + char *nick = muc_get_room_nick(jidp->barejid); + if (nick != NULL) { + if (strcmp(jidp->resourcepart, nick) == 0) { + return TRUE; + } else if (muc_is_room_pending_nick_change(jidp->barejid)) { + char *new_nick = jidp->resourcepart; + if (new_nick != NULL) { + char *old_nick = muc_get_old_nick(jidp->barejid, new_nick); + if (old_nick != NULL) { + if (strcmp(old_nick, nick) == 0) { + return TRUE; + } + } + } + } + } + } + } + return FALSE; } -gboolean +char * stanza_is_room_nick_change(xmpp_stanza_t * const stanza) { if (stanza == NULL) { - return FALSE; + return NULL; } if (strcmp(xmpp_stanza_get_name(stanza), STANZA_NAME_PRESENCE) != 0) { - return FALSE; + return NULL; } xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X); if (x == NULL) { - return FALSE; + return NULL; } char *ns = xmpp_stanza_get_ns(x); if (ns == NULL) { - return FALSE; + return NULL; } if (strcmp(ns, STANZA_NS_MUC_USER) != 0) { - return FALSE; + return NULL; } xmpp_stanza_t *x_children = xmpp_stanza_get_children(x); if (x_children == NULL) { - return FALSE; + return NULL; } + gboolean is_nick_change = FALSE; while (x_children != NULL) { if (strcmp(xmpp_stanza_get_name(x_children), STANZA_NAME_STATUS) == 0) { char *code = xmpp_stanza_get_attribute(x_children, STANZA_ATTR_CODE); if (strcmp(code, "303") == 0) { - return TRUE; + is_nick_change = TRUE; + break; } } x_children = xmpp_stanza_get_next(x_children); } - return FALSE; + if (is_nick_change) { + xmpp_stanza_t *x_children = xmpp_stanza_get_children(x); + while (x_children != NULL) { + if (strcmp(xmpp_stanza_get_name(x_children), STANZA_NAME_ITEM) == 0) { + char *new_nick = xmpp_stanza_get_attribute(x_children, STANZA_ATTR_NICK); + if (new_nick != NULL) { + return new_nick; + } + } + + x_children = xmpp_stanza_get_next(x_children); + } + } + return NULL; } char * diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h index ad777f24..50b14c75 100644 --- a/src/xmpp/stanza.h +++ b/src/xmpp/stanza.h @@ -146,7 +146,7 @@ gboolean stanza_get_delay(xmpp_stanza_t * const stanza, GTimeVal *tv_stamp); gboolean stanza_is_muc_presence(xmpp_stanza_t * const stanza); gboolean stanza_is_muc_self_presence(xmpp_stanza_t * const stanza, const char * const self_jid); -gboolean stanza_is_room_nick_change(xmpp_stanza_t * const stanza); +char * stanza_is_room_nick_change(xmpp_stanza_t * const stanza); char * stanza_get_new_nick(xmpp_stanza_t * const stanza); |